Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 9555511

Browse files
mheverymhevery
committed
style(angularPublic): move public export definition to AnuglarPublic.js
1 parent 94e1a07 commit 9555511

File tree

5 files changed

+100
-101
lines changed

5 files changed

+100
-101
lines changed

‎angularFiles.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
angularFiles = {
22
'angularSrc': [
33
'src/Angular.js',
4+
'src/AngularPublic.js',
45
'src/JSON.js',
56
'src/Injector.js',
67
'src/Resource.js',
@@ -39,8 +40,7 @@ angularFiles = {
3940
'src/widgets.js',
4041
'src/widget/form.js',
4142
'src/widget/input.js',
42-
'src/widget/select.js',
43-
'src/AngularPublic.js'
43+
'src/widget/select.js'
4444
],
4545

4646
'angularScenario': [
@@ -87,8 +87,7 @@ angularFiles = {
8787
'jstdExclude': [
8888
'test/jquery_alias.js',
8989
'src/angular-bootstrap.js',
90-
'src/scenario/angular-bootstrap.js',
91-
'src/AngularPublic.js'
90+
'src/scenario/angular-bootstrap.js'
9291
],
9392

9493
'jstdScenario': [
@@ -119,8 +118,7 @@ angularFiles = {
119118

120119
'jstdPerfExclude': [
121120
'src/angular-bootstrap.js',
122-
'src/scenario/angular-bootstrap.js',
123-
'src/AngularPublic.js'
121+
'src/scenario/angular-bootstrap.js'
124122
],
125123

126124
'jstdJquery': [
@@ -148,7 +146,6 @@ angularFiles = {
148146

149147
'jstdJqueryExclude': [
150148
'src/angular-bootstrap.js',
151-
'src/AngularPublic.js',
152149
'src/scenario/angular-bootstrap.js',
153150
'test/jquery_remove.js'
154151
]

‎src/Angular.js

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -917,93 +917,3 @@ function assertArgFn(arg, name) {
917917
(typeof arg == 'object' ? arg.constructor.name || 'Object' : typeof arg));
918918
return arg;
919919
}
920-
921-
function publishExternalAPI(angular){
922-
extend(angular, {
923-
'bootstrap': bootstrap,
924-
'copy': copy,
925-
'extend': extend,
926-
'equals': equals,
927-
'element': jqLite,
928-
'forEach': forEach,
929-
'injector': function(){ return createInjector(arguments, angularModule); },
930-
'noop':noop,
931-
'bind':bind,
932-
'toJson': toJson,
933-
'fromJson': fromJson,
934-
'identity':identity,
935-
'isUndefined': isUndefined,
936-
'isDefined': isDefined,
937-
'isString': isString,
938-
'isFunction': isFunction,
939-
'isObject': isObject,
940-
'isNumber': isNumber,
941-
'isElement': isElement,
942-
'isArray': isArray,
943-
'version': version,
944-
'isDate': isDate,
945-
'lowercase': lowercase,
946-
'uppercase': uppercase
947-
});
948-
949-
angularModule.ng = ngModule;
950-
}
951-
952-
ngModule.$inject = ['$provide', '$injector'];
953-
function ngModule($provide, $injector) {
954-
// TODO(misko): temporary services to get the compiler working;
955-
$provide.value('$textMarkup', angularTextMarkup);
956-
$provide.value('$attrMarkup', angularAttrMarkup);
957-
$provide.value('$directive', angularDirective);
958-
$provide.value('$widget', angularWidget);
959-
960-
// load the LOCALE if present
961-
$injector.invoke(null, angularModule.ngLocale || function(){
962-
$provide.service('$locale', $LocaleProvider);
963-
});
964-
965-
$provide.service('$browser', $BrowserProvider);
966-
$provide.service('$compile', $CompileProvider);
967-
$provide.service('$cookies', $CookiesProvider);
968-
$provide.service('$cookieStore', $CookieStoreProvider);
969-
$provide.service('$defer', $DeferProvider);
970-
$provide.service('$document', $DocumentProvider);
971-
$provide.service('$exceptionHandler', $ExceptionHandlerProvider);
972-
$provide.service('$filter', $FilterProvider);
973-
$provide.service('$formFactory', $FormFactoryProvider);
974-
$provide.service('$location', $LocationProvider);
975-
$provide.service('$log', $LogProvider);
976-
$provide.service('$parse', $ParseProvider);
977-
$provide.service('$resource', $ResourceProvider);
978-
$provide.service('$route', $RouteProvider);
979-
$provide.service('$routeParams', $RouteParamsProvider);
980-
$provide.service('$rootScope', $RootScopeProvider);
981-
$provide.service('$sniffer', $SnifferProvider);
982-
$provide.service('$window', $WindowProvider);
983-
$provide.service('$xhr.bulk', $XhrBulkProvider);
984-
$provide.service('$xhr.cache', $XhrCacheProvider);
985-
$provide.service('$xhr.error', $XhrErrorProvider);
986-
$provide.service('$xhr', $XhrProvider);
987-
}
988-
989-
990-
/**
991-
* @ngdoc property
992-
* @name angular.version
993-
* @description
994-
* An object that contains information about the current AngularJS version. This object has the
995-
* following properties:
996-
*
997-
* - `full` – `{string}` – Full version string, such as "0.9.18".
998-
* - `major` – `{number}` – Major version number, such as "0".
999-
* - `minor` – `{number}` – Minor version number, such as "9".
1000-
* - `dot` – `{number}` – Dot version number, such as "18".
1001-
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
1002-
*/
1003-
var version = {
1004-
full: '"NG_VERSION_FULL"', // all of these placeholder strings will be replaced by rake's
1005-
major: "NG_VERSION_MAJOR", // compile task
1006-
minor: "NG_VERSION_MINOR",
1007-
dot: "NG_VERSION_DOT",
1008-
codeName: '"NG_VERSION_CODENAME"'
1009-
};

‎src/AngularPublic.js

Lines changed: 89 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,92 @@
11
'use strict';
22

3-
//try to bind to jquery now so that one can write angular.element().read()
4-
//but we will rebind on bootstrap again.
5-
bindJQuery();
3+
/**
4+
* @ngdoc property
5+
* @name angular.version
6+
* @description
7+
* An object that contains information about the current AngularJS version. This object has the
8+
* following properties:
9+
*
10+
* - `full` – `{string}` – Full version string, such as "0.9.18".
11+
* - `major` – `{number}` – Major version number, such as "0".
12+
* - `minor` – `{number}` – Minor version number, such as "9".
13+
* - `dot` – `{number}` – Dot version number, such as "18".
14+
* - `codeName` – `{string}` – Code name of the release, such as "jiggling-armfat".
15+
*/
16+
var version = {
17+
full: '"NG_VERSION_FULL"', // all of these placeholder strings will be replaced by rake's
18+
major: "NG_VERSION_MAJOR", // compile task
19+
minor: "NG_VERSION_MINOR",
20+
dot: "NG_VERSION_DOT",
21+
codeName: '"NG_VERSION_CODENAME"'
22+
};
23+
24+
25+
function publishExternalAPI(angular){
26+
extend(angular, {
27+
'bootstrap': bootstrap,
28+
'copy': copy,
29+
'extend': extend,
30+
'equals': equals,
31+
'element': jqLite,
32+
'forEach': forEach,
33+
'injector': function(){ return createInjector(arguments, angularModule); },
34+
'noop':noop,
35+
'bind':bind,
36+
'toJson': toJson,
37+
'fromJson': fromJson,
38+
'identity':identity,
39+
'isUndefined': isUndefined,
40+
'isDefined': isDefined,
41+
'isString': isString,
42+
'isFunction': isFunction,
43+
'isObject': isObject,
44+
'isNumber': isNumber,
45+
'isElement': isElement,
46+
'isArray': isArray,
47+
'version': version,
48+
'isDate': isDate,
49+
'lowercase': lowercase,
50+
'uppercase': uppercase
51+
});
52+
53+
angularModule.ng = ngModule;
54+
}
55+
56+
ngModule.$inject = ['$provide', '$injector'];
57+
function ngModule($provide, $injector) {
58+
// TODO(misko): temporary services to get the compiler working;
59+
$provide.value('$textMarkup', angularTextMarkup);
60+
$provide.value('$attrMarkup', angularAttrMarkup);
61+
$provide.value('$directive', angularDirective);
62+
$provide.value('$widget', angularWidget);
63+
64+
// load the LOCALE if present
65+
$injector.invoke(null, angularModule.ngLocale || function(){
66+
$provide.service('$locale', $LocaleProvider);
67+
});
68+
69+
$provide.service('$browser', $BrowserProvider);
70+
$provide.service('$compile', $CompileProvider);
71+
$provide.service('$cookies', $CookiesProvider);
72+
$provide.service('$cookieStore', $CookieStoreProvider);
73+
$provide.service('$defer', $DeferProvider);
74+
$provide.service('$document', $DocumentProvider);
75+
$provide.service('$exceptionHandler', $ExceptionHandlerProvider);
76+
$provide.service('$filter', $FilterProvider);
77+
$provide.service('$formFactory', $FormFactoryProvider);
78+
$provide.service('$location', $LocationProvider);
79+
$provide.service('$log', $LogProvider);
80+
$provide.service('$parse', $ParseProvider);
81+
$provide.service('$resource', $ResourceProvider);
82+
$provide.service('$route', $RouteProvider);
83+
$provide.service('$routeParams', $RouteParamsProvider);
84+
$provide.service('$rootScope', $RootScopeProvider);
85+
$provide.service('$sniffer', $SnifferProvider);
86+
$provide.service('$window', $WindowProvider);
87+
$provide.service('$xhr.bulk', $XhrBulkProvider);
88+
$provide.service('$xhr.cache', $XhrCacheProvider);
89+
$provide.service('$xhr.error', $XhrErrorProvider);
90+
$provide.service('$xhr', $XhrProvider);
91+
}
692

7-
publishExternalAPI(angular);

‎src/angular.suffix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
//try to bind to jquery now so that one can write angular.element().read()
2+
//but we will rebind on bootstrap again.
3+
bindJQuery();
4+
5+
publishExternalAPI(angular);
16

27
var config = angularJsConfig(document);
38

‎src/scenario/angular.suffix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
publishExternalAPI(angular);
2+
13
var $runner = new angular.scenario.Runner(window),
24
config = angularJsConfig(document);
35

0 commit comments

Comments
 (0)