X Tutup
Skip to content

Commit 2430f52

Browse files
mheverymhevery
committed
chore(module): move files around in preparation for more modules
1 parent 944098a commit 2430f52

File tree

305 files changed

+114
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

305 files changed

+114
-105
lines changed

‎Rakefile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ task :compile_scenario => :init do
3737

3838
deps = [
3939
'lib/jquery/jquery.js',
40-
'src/scenario/angular.prefix',
40+
'src/ngScenario/angular.prefix',
4141
files['angularSrc'],
4242
files['angularScenario'],
43-
'src/scenario/angular.suffix',
43+
'src/ngScenario/angular.suffix',
4444
]
4545

4646
concat = 'cat ' + deps.flatten.join(' ')
@@ -56,9 +56,9 @@ desc 'Compile JSTD Scenario Adapter'
5656
task :compile_jstd_scenario_adapter => :init do
5757

5858
deps = [
59-
'src/jstd-scenario-adapter/angular.prefix',
60-
'src/jstd-scenario-adapter/Adapter.js',
61-
'src/jstd-scenario-adapter/angular.suffix',
59+
'src/ngScenario/jstd-scenario-adapter/angular.prefix',
60+
'src/ngScenario/jstd-scenario-adapter/Adapter.js',
61+
'src/ngScenario/jstd-scenario-adapter/angular.suffix',
6262
]
6363

6464
concat = 'cat ' + deps.flatten.join(' ')
@@ -108,7 +108,7 @@ task :compile => [:init, :compile_scenario, :compile_jstd_scenario_adapter] do
108108
--js #{path_to('angular.js')} \
109109
--js_output_file #{path_to('angular.min.js')})
110110

111-
FileUtils.cp_r 'i18n/locale', path_to('i18n')
111+
FileUtils.cp_r 'src/ngLocale', path_to('i18n')
112112

113113
File.open(path_to('angular-loader.js'), 'w') do |f|
114114
concat = 'cat ' + [
@@ -153,7 +153,7 @@ task :package => [:clean, :compile, :docs] do
153153
FileUtils.rm_r(path_to('pkg'), :force => true)
154154
FileUtils.mkdir_p(pkg_dir)
155155

156-
['src/angular-mocks.js',
156+
['src/ngMock/angular-mocks.js',
157157
path_to('angular.js'),
158158
path_to('angular-loader.js'),
159159
path_to('angular.min.js'),
@@ -162,7 +162,7 @@ task :package => [:clean, :compile, :docs] do
162162
path_to('jstd-scenario-adapter.js'),
163163
path_to('jstd-scenario-adapter-config.js'),
164164
].each do |src|
165-
dest = src.gsub(/^[^\/]+\//, '').gsub(/((\.min)?\.js)$/, "-#{NG_VERSION.full}\\1")
165+
dest = src.gsub(/^.*\//, '').gsub(/((\.min)?\.js)$/, "-#{NG_VERSION.full}\\1")
166166
FileUtils.cp(src, pkg_dir + '/' + dest)
167167
end
168168

‎angularFiles.js‎

Lines changed: 105 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -4,79 +4,83 @@ angularFiles = {
44
'src/loader.js',
55
'src/AngularPublic.js',
66
'src/JSON.js',
7-
'src/Injector.js',
87
'src/jqLite.js',
98
'src/apis.js',
10-
'src/service/anchorScroll.js',
11-
'src/service/browser.js',
12-
'src/service/cacheFactory.js',
13-
'src/service/compiler.js',
14-
'src/service/controller.js',
15-
'src/service/cookieStore.js',
16-
'src/service/cookies.js',
17-
'src/service/defer.js',
18-
'src/service/document.js',
19-
'src/service/exceptionHandler.js',
20-
'src/service/filter.js',
21-
'src/service/filter/filter.js',
22-
'src/service/filter/filters.js',
23-
'src/service/filter/limitTo.js',
24-
'src/service/filter/orderBy.js',
25-
'src/service/interpolate.js',
26-
'src/service/location.js',
27-
'src/service/log.js',
28-
'src/service/resource.js',
29-
'src/service/parse.js',
30-
'src/service/q.js',
31-
'src/service/route.js',
32-
'src/service/routeParams.js',
33-
'src/service/scope.js',
34-
'src/service/sanitize.js',
35-
'src/service/sniffer.js',
36-
'src/service/window.js',
37-
'src/service/http.js',
38-
'src/service/httpBackend.js',
39-
'src/service/locale.js',
40-
'src/directive/directives.js',
41-
'src/directive/a.js',
42-
'src/directive/booleanAttrDirs.js',
43-
'src/directive/form.js',
44-
'src/directive/input.js',
45-
'src/directive/ngBind.js',
46-
'src/directive/ngClass.js',
47-
'src/directive/ngCloak.js',
48-
'src/directive/ngController.js',
49-
'src/directive/ngEventDirs.js',
50-
'src/directive/ngInclude.js',
51-
'src/directive/ngInit.js',
52-
'src/directive/ngNonBindable.js',
53-
'src/directive/ngPluralize.js',
54-
'src/directive/ngRepeat.js',
55-
'src/directive/ngShowHide.js',
56-
'src/directive/ngStyle.js',
57-
'src/directive/ngSwitch.js',
58-
'src/directive/ngTransclude.js',
59-
'src/directive/ngView.js',
60-
'src/directive/script.js',
61-
'src/directive/select.js',
62-
'src/directive/style.js'
9+
10+
'src/auto/injector.js',
11+
12+
'src/ng/anchorScroll.js',
13+
'src/ng/browser.js',
14+
'src/ng/cacheFactory.js',
15+
'src/ng/compiler.js',
16+
'src/ng/controller.js',
17+
'src/ng/cookieStore.js',
18+
'src/ng/cookies.js',
19+
'src/ng/defer.js',
20+
'src/ng/document.js',
21+
'src/ng/exceptionHandler.js',
22+
'src/ng/interpolate.js',
23+
'src/ng/location.js',
24+
'src/ng/log.js',
25+
'src/ng/parse.js',
26+
'src/ng/q.js',
27+
'src/ng/resource.js',
28+
'src/ng/route.js',
29+
'src/ng/routeParams.js',
30+
'src/ng/rootScope.js',
31+
'src/ng/sanitize.js',
32+
'src/ng/sniffer.js',
33+
'src/ng/window.js',
34+
'src/ng/http.js',
35+
'src/ng/httpBackend.js',
36+
'src/ng/locale.js',
37+
38+
'src/ng/filter.js',
39+
'src/ng/filter/filter.js',
40+
'src/ng/filter/filters.js',
41+
'src/ng/filter/limitTo.js',
42+
'src/ng/filter/orderBy.js',
43+
44+
'src/ng/directive/directives.js',
45+
'src/ng/directive/a.js',
46+
'src/ng/directive/booleanAttrDirs.js',
47+
'src/ng/directive/form.js',
48+
'src/ng/directive/input.js',
49+
'src/ng/directive/ngBind.js',
50+
'src/ng/directive/ngClass.js',
51+
'src/ng/directive/ngCloak.js',
52+
'src/ng/directive/ngController.js',
53+
'src/ng/directive/ngEventDirs.js',
54+
'src/ng/directive/ngInclude.js',
55+
'src/ng/directive/ngInit.js',
56+
'src/ng/directive/ngNonBindable.js',
57+
'src/ng/directive/ngPluralize.js',
58+
'src/ng/directive/ngRepeat.js',
59+
'src/ng/directive/ngShowHide.js',
60+
'src/ng/directive/ngStyle.js',
61+
'src/ng/directive/ngSwitch.js',
62+
'src/ng/directive/ngTransclude.js',
63+
'src/ng/directive/ngView.js',
64+
'src/ng/directive/script.js',
65+
'src/ng/directive/select.js',
66+
'src/ng/directive/style.js'
6367
],
6468

6569
'angularScenario': [
66-
'src/scenario/Scenario.js',
67-
'src/scenario/Application.js',
68-
'src/scenario/Describe.js',
69-
'src/scenario/Future.js',
70-
'src/scenario/ObjectModel.js',
71-
'src/scenario/Describe.js',
72-
'src/scenario/Runner.js',
73-
'src/scenario/SpecRunner.js',
74-
'src/scenario/dsl.js',
75-
'src/scenario/matchers.js',
76-
'src/scenario/output/Html.js',
77-
'src/scenario/output/Json.js',
78-
'src/scenario/output/Xml.js',
79-
'src/scenario/output/Object.js'
70+
'src/ngScenario/Scenario.js',
71+
'src/ngScenario/Application.js',
72+
'src/ngScenario/Describe.js',
73+
'src/ngScenario/Future.js',
74+
'src/ngScenario/ObjectModel.js',
75+
'src/ngScenario/Describe.js',
76+
'src/ngScenario/Runner.js',
77+
'src/ngScenario/SpecRunner.js',
78+
'src/ngScenario/dsl.js',
79+
'src/ngScenario/matchers.js',
80+
'src/ngScenario/output/Html.js',
81+
'src/ngScenario/output/Json.js',
82+
'src/ngScenario/output/Xml.js',
83+
'src/ngScenario/output/Object.js'
8084
],
8185

8286
'jstd': [
@@ -88,25 +92,27 @@ angularFiles = {
8892
'example/personalLog/*.js',
8993
'test/testabilityPatch.js',
9094
'test/matchers.js',
91-
'src/scenario/Scenario.js',
92-
'src/scenario/output/*.js',
93-
'src/jstd-scenario-adapter/*.js',
94-
'src/scenario/*.js',
95-
'src/angular-mocks.js',
96-
'test/scenario/*.js',
97-
'test/scenario/output/*.js',
98-
'test/jstd-scenario-adapter/*.js',
95+
'src/ngScenario/Scenario.js',
96+
'src/ngScenario/output/*.js',
97+
'src/ngScenario/jstd-scenario-adapter/*.js',
98+
'src/ngScenario/*.js',
99+
'src/ngMock/angular-mocks.js',
100+
'test/ngScenario/*.js',
101+
'test/ngScenario/output/*.js',
102+
'test/ngScenario/jstd-scenario-adapter/*.js',
99103
'test/*.js',
100-
'test/service/*.js',
101-
'test/service/filter/*.js',
102-
'test/directive/*.js',
104+
'test/auto/*.js',
105+
'test/ng/*.js',
106+
'test/ng/directive/*.js',
107+
'test/ng/filter/*.js',
108+
'test/ngMock/*.js',
103109
'example/personalLog/test/*.js'
104110
],
105111

106112
'jstdExclude': [
107113
'test/jquery_alias.js',
108114
'src/angular-bootstrap.js',
109-
'src/scenario/angular-bootstrap.js'
115+
'src/ngScenario/angular-bootstrap.js'
110116
],
111117

112118
'jstdScenario': [
@@ -120,24 +126,24 @@ angularFiles = {
120126
'lib/jasmine/jasmine.js',
121127
'lib/jasmine-jstd-adapter/JasmineAdapter.js',
122128
'build/angular.js',
123-
'src/angular-mocks.js',
129+
'src/ngMock/angular-mocks.js',
124130
'test/matchers.js',
125-
'test/angular-mocksSpec.js'
131+
'test/ngMock/angular-mocksSpec.js'
126132
],
127133

128134
'jstdPerf': [
129135
'lib/jasmine/jasmine.js',
130136
'lib/jasmine-jstd-adapter/JasmineAdapter.js',
131137
'angularSrc',
132-
'src/angular-mocks.js',
138+
'src/ngMock/angular-mocks.js',
133139
'perf/data/*.js',
134140
'perf/testUtils.js',
135141
'perf/*.js'
136142
],
137143

138144
'jstdPerfExclude': [
139-
'src/angular-bootstrap.js',
140-
'src/scenario/angular-bootstrap.js'
145+
'src/ng/angular-bootstrap.js',
146+
'src/ngScenario/angular-bootstrap.js'
141147
],
142148

143149
'jstdJquery': [
@@ -149,23 +155,26 @@ angularFiles = {
149155
'example/personalLog/*.js',
150156
'test/testabilityPatch.js',
151157
'test/matchers.js',
152-
'src/scenario/Scenario.js',
153-
'src/scenario/output/*.js',
154-
'src/jstd-scenario-adapter/*.js',
155-
'src/scenario/*.js',
156-
'src/angular-mocks.js',
157-
'test/scenario/*.js',
158-
'test/scenario/output/*.js',
159-
'test/jstd-scenario-adapter/*.js',
158+
'src/ngScenario/Scenario.js',
159+
'src/ngScenario/output/*.js',
160+
'src/ngScenario/jstd-scenario-adapter/*.js',
161+
'src/ngScenario/*.js',
162+
'src/ngMock/angular-mocks.js',
163+
'test/ngScenario/*.js',
164+
'test/ngScenario/output/*.js',
165+
'test/ngScenario/jstd-scenario-adapter/*.js',
160166
'test/*.js',
161-
'test/service/*.js',
162-
'test/directive/*.js',
167+
'test/auto/*.js',
168+
'test/ng/*.js',
169+
'test/ng/directive/*.js',
170+
'test/ng/filter/*.js',
171+
'test/ngMock/*.js',
163172
'example/personalLog/test/*.js'
164173
],
165174

166175
'jstdJqueryExclude': [
167176
'src/angular-bootstrap.js',
168-
'src/scenario/angular-bootstrap.js',
177+
'src/ngScenario/angular-bootstrap.js',
169178
'test/jquery_remove.js'
170179
]
171180
};

‎i18n/src/closureSlurper.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var Q = require('qq'),
1212
require: function() {},
1313
i18n: {currency: {}, pluralRules: {}} };
1414

15-
createFolder('../locale/').then(function() {
15+
createFolder('../../src/ngLocale/').then(function() {
1616
var promiseA = Q.defer(),
1717
promiseB = Q.defer();
1818

src/Injector.js renamed to src/auto/injector.js

File renamed without changes.

src/service/anchorScroll.js renamed to src/ng/anchorScroll.js

File renamed without changes.

src/service/browser.js renamed to src/ng/browser.js

File renamed without changes.

src/service/cacheFactory.js renamed to src/ng/cacheFactory.js

File renamed without changes.

src/service/compiler.js renamed to src/ng/compiler.js

File renamed without changes.

src/service/controller.js renamed to src/ng/controller.js

File renamed without changes.

src/service/cookieStore.js renamed to src/ng/cookieStore.js

File renamed without changes.

0 commit comments

Comments
 (0)
X Tutup