Skip to content

Commit 7b22d59

Browse files
mheverymhevery
committed
chore(ngCookies): moved to module
1 parent 798bca6 commit 7b22d59

11 files changed

Lines changed: 207 additions & 195 deletions

File tree

‎Rakefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,11 @@ task :compile => [:init, :compile_scenario, :compile_jstd_scenario_adapter] do
8181

8282
FileUtils.cp 'src/ngMock/angular-mocks.js', path_to('angular-mocks.js')
8383
FileUtils.cp 'src/ngResource/resource.js', path_to('angular-resource.js')
84+
FileUtils.cp 'src/ngCookies/cookies.js', path_to('angular-cookies.js')
8485

8586

8687
closureCompile('angular.js')
88+
closureCompile('angular-cookies.js')
8789
closureCompile('angular-loader.js')
8890
closureCompile('angular-resource.js')
8991

@@ -115,6 +117,8 @@ task :package => [:clean, :compile, :docs] do
115117
path_to('angular-loader.js'),
116118
path_to('angular-loader.min.js'),
117119
path_to('angular-mocks.js'),
120+
path_to('angular-cookies.js'),
121+
path_to('angular-cookies.min.js'),
118122
path_to('angular-resource.js'),
119123
path_to('angular-resource.min.js'),
120124
path_to('angular-scenario.js'),

‎angularFiles.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ angularFiles = {
1414
'src/ng/cacheFactory.js',
1515
'src/ng/compiler.js',
1616
'src/ng/controller.js',
17-
'src/ng/cookieStore.js',
18-
'src/ng/cookies.js',
1917
'src/ng/defer.js',
2018
'src/ng/document.js',
2119
'src/ng/exceptionHandler.js',
@@ -66,6 +64,7 @@ angularFiles = {
6664
],
6765

6866
'angularSrcModules': [
67+
'src/ngCookies/cookies.js',
6968
'src/ngResource/resource.js',
7069
'src/ngMock/angular-mocks.js'
7170
],
@@ -98,6 +97,7 @@ angularFiles = {
9897
'test/ng/*.js',
9998
'test/ng/directive/*.js',
10099
'test/ng/filter/*.js',
100+
'test/ngCookies/*.js',
101101
'test/ngResource/*.js',
102102
'test/ngMock/*.js'
103103
],
@@ -135,9 +135,11 @@ angularFiles = {
135135
'lib/jasmine-jstd-adapter/JasmineAdapter.js',
136136
'build/angular.js',
137137
'src/ngMock/angular-mocks.js',
138+
'src/ngCookies/cookies.js',
138139
'src/ngResource/resource.js',
139140
'test/matchers.js',
140141
'test/ngMock/*.js',
142+
'test/ngCookies/*.js',
141143
'test/ngResource/*.js'
142144
],
143145

@@ -169,6 +171,7 @@ angularFiles = {
169171
'src/ngScenario/jstd-scenario-adapter/Adapter.js',
170172
'@angularTest',
171173
'example/personalLog/*.js',
174+
172175
'example/personalLog/test/*.js'
173176
],
174177

‎docs/src/templates/docs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ function TutorialInstructionsCtrl($cookieStore) {
146146
};
147147
}
148148

149-
angular.module('ngdocs', ['ngdocs.directives', 'ngResource'], function($locationProvider, $filterProvider, $compileProvider) {
149+
angular.module('ngdocs', ['ngdocs.directives', 'ngResource', 'ngCookies'], function($locationProvider, $filterProvider, $compileProvider) {
150150
$locationProvider.html5Mode(true).hashPrefix('!');
151151

152152
$filterProvider.register('title', function(){

‎docs/src/templates/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
if (jQuery) addTag('script', {src: 'jquery.min.js'});
3030
addTag('script', {src: path('angular.js')}, sync);
3131
addTag('script', {src: path('angular-resource.js') }, sync);
32+
addTag('script', {src: path('angular-cookies.js') }, sync);
3233
addTag('script', {src: 'docs-combined.js'}, sync);
3334
addTag('script', {src: 'docs-keywords.js'}, sync);
3435

‎example/personalLog/test/personalLogSpec.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ describe('example.personalLog.LogCtrl', function() {
22
var logScope;
33

44
beforeEach(function() {
5-
var injector = angular.injector(['ng', 'ngMock']);
5+
var injector = angular.injector(['ng', 'ngMock', 'ngCookies']);
66
logScope = injector.get('$rootScope');
77
logScope.$cookies = injector.get('$cookies');
88
injector.instantiate(example.personalLog.LogCtrl, {$scope: logScope});

‎src/AngularPublic.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ function publishExternalAPI(angular){
110110
$browser: $BrowserProvider,
111111
$cacheFactory: $CacheFactoryProvider,
112112
$controller: $ControllerProvider,
113-
$cookies: $CookiesProvider,
114-
$cookieStore: $CookieStoreProvider,
115113
$defer: $DeferProvider,
116114
$document: $DocumentProvider,
117115
$exceptionHandler: $ExceptionHandlerProvider,

‎src/ng/cookieStore.js‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎src/ng/cookies.js‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)