Merge pull request #858 from meenie/857-fix

fix(uiView): Refactoring uiView directive to copy ngView logic
angular-ui · Mar 6, 2014 · 4d74d98 · 4d74d98
2 parents cb1c9cf + 548fab6
commit 4d74d98
Show file tree

Hide file tree

Showing 13 changed files with 6,900 additions and 5,070 deletions.
diff --git a/config/karma.js b/config/karma.js
@@ -8,7 +8,7 @@ module.exports = function (karma) {
     basePath: '..',
 
     // list of files / patterns to load in the browser
-    files: [].concat(files.angular('1.2.4'), files.testUtils, files.src, files.test),
+    files: [].concat(files.angular('1.2.14'), files.testUtils, files.src, files.test),
 
     // level of logging
     // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG

diff --git a/files.js b/files.js
@@ -25,10 +25,10 @@ routerFiles = {
     return [
       'lib/angular-' + version + '/angular.js',
       'lib/angular-' + version + '/angular-mocks.js'
-    ].concat(version === '1.2.4' ? ['lib/angular-' + version + '/angular-animate.js'] : []);
+    ].concat(version === '1.2.14' ? ['lib/angular-' + version + '/angular-animate.js'] : []);
   }
 };
 
 if (exports) {
   exports.files = routerFiles;
-}
+}