Added 1.2 references to app.js and dev.app.js

This commit is contained in:
perploug
2013-08-21 21:11:15 +02:00
parent 16c67bd435
commit d181a39343
6 changed files with 92 additions and 42 deletions

View File

@@ -5,6 +5,9 @@ var app = angular.module('umbraco', [
'umbraco.services',
'umbraco.mocks',
'umbraco.security',
'ngCookies',
'ngRoute'
]);
'ngCookies'
]);
/* For Angular 1.2: we need to load in Routing seperately
'ngRoute'
*/

View File

@@ -8,10 +8,22 @@ module.exports = function(karma) {
// list of files / patterns to load in the browser
files: [
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/angular.min.js',
'lib/angular/angular-cookies.min.js',
'lib/angular/1.1.5/angular.js',
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mocks.js',
/*
For angular 1.2:
'lib/angular/1.2/angular.js',
'lib/angular/1.2/angular-route.min.js',
'lib/angular/1.2/angular-touch.min.js',
'lib/angular/1.2/angular-cookies.min.js',
'lib/angular/1.2/angular-animate.min.js',
'lib/angular/1.2/angular-mocks.js',
*/
'lib/underscore/underscore.js',
'test/lib/angular/angular-mocks.js',
'lib/umbraco/Extensions.js',
'test/config/app.unit.js',