Skip to content

Commit 548fab6

Browse files
author
Cody Lundquist
committed
fix(uiView): Refactoring uiView directive to copy ngView logic
- Changed the structure of the uiView directive to work more like ngView. - Updated tests to work with new structure. - Updated tests so that all assertions actually run through AngularJS 1.0.8. - Added in extensive test for ngIf fix. - Added in ability for uiView to work with ngIf, ngRepeat, and ngClass. - Updated base AngularJS version to 1.2.14 to test $animate callbacks in 1.2.* - Fixes controllerAs so that it will work within a view declaration. Closes #857, #552
1 parent cb1c9cf commit 548fab6

13 files changed

+6900
-5070
lines changed

config/karma.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = function (karma) {
88
basePath: '..',
99

1010
// list of files / patterns to load in the browser
11-
files: [].concat(files.angular('1.2.4'), files.testUtils, files.src, files.test),
11+
files: [].concat(files.angular('1.2.14'), files.testUtils, files.src, files.test),
1212

1313
// level of logging
1414
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG

files.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ routerFiles = {
2525
return [
2626
'lib/angular-' + version + '/angular.js',
2727
'lib/angular-' + version + '/angular-mocks.js'
28-
].concat(version === '1.2.4' ? ['lib/angular-' + version + '/angular-animate.js'] : []);
28+
].concat(version === '1.2.14' ? ['lib/angular-' + version + '/angular-animate.js'] : []);
2929
}
3030
};
3131

3232
if (exports) {
3333
exports.files = routerFiles;
34-
}
34+
}

0 commit comments

Comments
 (0)