aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2013-05-08 16:40:00 -0700
committerMisko Hevery2013-05-08 16:40:35 -0700
commit29efd39745ac14c89ef8bc79993b51450fd0a8b9 (patch)
tree15715fa3dff30b494e0165aa5ff3bd9baac086b9
parent11f712bc3e310302eb2e8691cf6d110bdcde1810 (diff)
downloadangular.js-29efd39745ac14c89ef8bc79993b51450fd0a8b9.tar.bz2
fix(scenario): update to use our angular-scenario.js rather then karma
-rw-r--r--karma-e2e.conf.js2
-rw-r--r--src/ngScenario/Application.js1
2 files changed, 2 insertions, 1 deletions
diff --git a/karma-e2e.conf.js b/karma-e2e.conf.js
index 07c79c70..d70d8522 100644
--- a/karma-e2e.conf.js
+++ b/karma-e2e.conf.js
@@ -1,6 +1,6 @@
var angularFiles = require(__dirname + '/angularFiles.js');
-files = [ANGULAR_SCENARIO, ANGULAR_SCENARIO_ADAPTER, 'build/docs/docs-scenario.js'];
+files = ['build/angular-scenario.js', ANGULAR_SCENARIO_ADAPTER, 'build/docs/docs-scenario.js'];
autoWatch = false;
singleRun = true;
diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js
index 2f8208d2..a1ef47c7 100644
--- a/src/ngScenario/Application.js
+++ b/src/ngScenario/Application.js
@@ -76,6 +76,7 @@ angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorF
$window.angular.resumeBootstrap([['$provide', function($provide) {
$provide.decorator('$sniffer', function($delegate) {
$delegate.transitions = false;
+ $delegate.animations = false;
return $delegate;
});
}]]);