diff --git a/angularFiles.js b/angularFiles.js index 35f302cee0d5..cbc98db0b4d1 100755 --- a/angularFiles.js +++ b/angularFiles.js @@ -137,7 +137,8 @@ var angularFiles = { 'src/ngSanitize/filter/linky.js' ], 'ngMock': [ - 'src/ngMock/angular-mocks.js' + 'src/ngMock/angular-mocks.js', + 'src/ngMock/browserTrigger.js' ], 'ngTouch': [ 'src/ngTouch/touch.js', @@ -152,7 +153,6 @@ var angularFiles = { 'angularScenario': [ 'src/ngScenario/Scenario.js', - 'src/ngScenario/browserTrigger.js', 'src/ngScenario/Application.js', 'src/ngScenario/Describe.js', 'src/ngScenario/Future.js', @@ -211,7 +211,6 @@ var angularFiles = { 'build/angular.js', '@angularSrcModules', 'test/modules/no_bootstrap.js', - 'src/ngScenario/browserTrigger.js', 'test/helpers/*.js', 'test/ngAnimate/*.js', 'test/ngMessageFormat/*.js', diff --git a/src/ngMock/.jshintrc b/src/ngMock/.jshintrc index 78bca4c944ae..ca9fcdd54d0a 100644 --- a/src/ngMock/.jshintrc +++ b/src/ngMock/.jshintrc @@ -5,6 +5,11 @@ "angular": false, "expect": false, - "jQuery": false + "jQuery": false, + + "AnimationEvent": false, + "TransitionEvent": false, + "WebKitAnimationEvent": false, + "WebKitTransitionEvent": false } } diff --git a/src/ngScenario/browserTrigger.js b/src/ngMock/browserTrigger.js similarity index 100% rename from src/ngScenario/browserTrigger.js rename to src/ngMock/browserTrigger.js diff --git a/src/ngScenario/.jshintrc b/src/ngScenario/.jshintrc index a348bb0c762c..ab7250a69be3 100644 --- a/src/ngScenario/.jshintrc +++ b/src/ngScenario/.jshintrc @@ -13,10 +13,6 @@ "_jQuery": false, "angularInit": false, "formatException": false, - "AnimationEvent": false, - "TransitionEvent": false, - "WebKitAnimationEvent": false, - "WebKitTransitionEvent": false, "$runner": false, "callerFile": false }