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

Commit

Permalink
chore(ngCookies): moved to module
Browse files Browse the repository at this point in the history
  • Loading branch information
mhevery committed Mar 28, 2012
1 parent 798bca6 commit 7b22d59
Show file tree
Hide file tree
Showing 11 changed files with 207 additions and 195 deletions.
4 changes: 4 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ task :compile => [:init, :compile_scenario, :compile_jstd_scenario_adapter] do

FileUtils.cp 'src/ngMock/angular-mocks.js', path_to('angular-mocks.js')
FileUtils.cp 'src/ngResource/resource.js', path_to('angular-resource.js')
FileUtils.cp 'src/ngCookies/cookies.js', path_to('angular-cookies.js')


closureCompile('angular.js')
closureCompile('angular-cookies.js')
closureCompile('angular-loader.js')
closureCompile('angular-resource.js')

Expand Down Expand Up @@ -115,6 +117,8 @@ task :package => [:clean, :compile, :docs] do
path_to('angular-loader.js'),
path_to('angular-loader.min.js'),
path_to('angular-mocks.js'),
path_to('angular-cookies.js'),
path_to('angular-cookies.min.js'),
path_to('angular-resource.js'),
path_to('angular-resource.min.js'),
path_to('angular-scenario.js'),
Expand Down
7 changes: 5 additions & 2 deletions angularFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ angularFiles = {
'src/ng/cacheFactory.js',
'src/ng/compiler.js',
'src/ng/controller.js',
'src/ng/cookieStore.js',
'src/ng/cookies.js',
'src/ng/defer.js',
'src/ng/document.js',
'src/ng/exceptionHandler.js',
Expand Down Expand Up @@ -66,6 +64,7 @@ angularFiles = {
],

'angularSrcModules': [
'src/ngCookies/cookies.js',
'src/ngResource/resource.js',
'src/ngMock/angular-mocks.js'
],
Expand Down Expand Up @@ -98,6 +97,7 @@ angularFiles = {
'test/ng/*.js',
'test/ng/directive/*.js',
'test/ng/filter/*.js',
'test/ngCookies/*.js',
'test/ngResource/*.js',
'test/ngMock/*.js'
],
Expand Down Expand Up @@ -135,9 +135,11 @@ angularFiles = {
'lib/jasmine-jstd-adapter/JasmineAdapter.js',
'build/angular.js',
'src/ngMock/angular-mocks.js',
'src/ngCookies/cookies.js',
'src/ngResource/resource.js',
'test/matchers.js',
'test/ngMock/*.js',
'test/ngCookies/*.js',
'test/ngResource/*.js'
],

Expand Down Expand Up @@ -169,6 +171,7 @@ angularFiles = {
'src/ngScenario/jstd-scenario-adapter/Adapter.js',
'@angularTest',
'example/personalLog/*.js',

'example/personalLog/test/*.js'
],

Expand Down
2 changes: 1 addition & 1 deletion docs/src/templates/docs.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function TutorialInstructionsCtrl($cookieStore) {
};
}

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

$filterProvider.register('title', function(){
Expand Down
1 change: 1 addition & 0 deletions docs/src/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
if (jQuery) addTag('script', {src: 'jquery.min.js'});
addTag('script', {src: path('angular.js')}, sync);
addTag('script', {src: path('angular-resource.js') }, sync);
addTag('script', {src: path('angular-cookies.js') }, sync);
addTag('script', {src: 'docs-combined.js'}, sync);
addTag('script', {src: 'docs-keywords.js'}, sync);

Expand Down
2 changes: 1 addition & 1 deletion example/personalLog/test/personalLogSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ describe('example.personalLog.LogCtrl', function() {
var logScope;

beforeEach(function() {
var injector = angular.injector(['ng', 'ngMock']);
var injector = angular.injector(['ng', 'ngMock', 'ngCookies']);
logScope = injector.get('$rootScope');
logScope.$cookies = injector.get('$cookies');
injector.instantiate(example.personalLog.LogCtrl, {$scope: logScope});
Expand Down
2 changes: 0 additions & 2 deletions src/AngularPublic.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ function publishExternalAPI(angular){
$browser: $BrowserProvider,
$cacheFactory: $CacheFactoryProvider,
$controller: $ControllerProvider,
$cookies: $CookiesProvider,
$cookieStore: $CookieStoreProvider,
$defer: $DeferProvider,
$document: $DocumentProvider,
$exceptionHandler: $ExceptionHandlerProvider,
Expand Down
64 changes: 0 additions & 64 deletions src/ng/cookieStore.js

This file was deleted.

94 changes: 0 additions & 94 deletions src/ng/cookies.js

This file was deleted.

Loading

0 comments on commit 7b22d59

Please sign in to comment.