yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/app.dev.js
View File

@@ -5,6 +5,13 @@ var app = angular.module('umbraco', [
'umbraco.services',
'umbraco.httpbackend',
'ngCookies',
'ngRoute',
'ngMobile'
'ui.sortable'
]);
]);
/* For Angular 1.2: we need to load in Route, animate and touch seperately
'ngRoute',
'ngAnimate',
'ngTouch'
*/

8
src/Umbraco.Web.UI.Client/src/app.js
View File

@@ -4,6 +4,12 @@ var app = angular.module('umbraco', [
'umbraco.resources',
'umbraco.services',
'ngCookies',
'ngRoute',
'ui.sortable'
]);
/* For Angular 1.2: we need to load in Route, animate and touch seperately
'ngRoute',
'ngAnimate',
'ngTouch'
*/

73
src/Umbraco.Web.UI.Client/src/loader.js
View File

@@ -1,40 +1,51 @@
yepnope({
load: [
'lib/jquery/jquery-2.0.3.min.js',
/* the jquery ui elements we need */
/* NOTE: I've opted not to use the full lib, just the parts we need to save on DL */
'lib/jquery/jquery.ui.core.min.js',
'lib/jquery/jquery.ui.widget.min.js',
'lib/jquery/jquery.ui.mouse.min.js',
'lib/jquery/jquery.ui.sortable.min.js',
'lib/jquery/jquery.ui.effect.min.js',
'lib/jquery/jquery.ui.effect-highlight.min.js',
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/angular.min.js',
'lib/angular/angular-cookies.min.js',
'lib/angular/angular-mocks.js',
'lib/angular/angular-ui-sortable.js',
/* the jquery ui elements we need */
/* NOTE: I've opted not to use the full lib, just the parts we need to save on DL */
'lib/jquery/jquery.ui.core.min.js',
'lib/jquery/jquery.ui.widget.min.js',
'lib/jquery/jquery.ui.mouse.min.js',
'lib/jquery/jquery.ui.sortable.min.js',
'lib/jquery/jquery.ui.effect.min.js',
'lib/jquery/jquery.ui.effect-highlight.min.js',
'lib/bootstrap/js/bootstrap.js',
'lib/underscore/underscore.js',
'lib/umbraco/Extensions.js',
'lib/umbraco/NamespaceManager.js',
'js/umbraco.servervariables.js',
'js/app.dev.js',
'js/umbraco.httpbackend.js',
'js/umbraco.testing.js',
/* 1.1.5 */
'lib/angular/1.1.5/angular.min.js',
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mobile.min.js',
'lib/angular/1.1.5/angular-mocks.js',
'js/umbraco.directives.js',
'js/umbraco.filters.js',
'js/umbraco.resources.js',
'js/umbraco.services.js',
'js/umbraco.security.js',
'js/umbraco.controllers.js',
'js/routes.js'
/* 1.2 RC1
'lib/angular/1.2/angular.min.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/angular/angular-ui-sortable.js',
'lib/bootstrap/js/bootstrap.js',
'lib/underscore/underscore.js',
'lib/umbraco/Extensions.js',
'lib/umbraco/NamespaceManager.js',
'js/umbraco.servervariables.js',
'js/app.dev.js',
'js/umbraco.httpbackend.js',
'js/umbraco.testing.js',
'js/umbraco.directives.js',
'js/umbraco.filters.js',
'js/umbraco.resources.js',
'js/umbraco.services.js',
'js/umbraco.security.js',
'js/umbraco.controllers.js',
'js/routes.js'
],
complete: function () {

9
src/Umbraco.Web.UI.Client/test/config/app.unit.js
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'
*/

18
src/Umbraco.Web.UI.Client/test/config/karma.conf.js
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',

15
src/Umbraco.Web/UI/JavaScript/JsInitialize.js
View File

@@ -10,8 +10,19 @@
'lib/jquery/jquery.ui.effect.min.js',
'lib/jquery/jquery.ui.effect-highlight.min.js',
'lib/angular/angular.min.js',
'lib/angular/angular-cookies.min.js',
/* 1.1.5 */
'lib/angular/1.1.5/angular.min.js',
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mobile.min.js',
/* 1.2 RC1
'lib/angular/1.2/angular.min.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/angular-ui-sortable.js',
'lib/bootstrap/js/bootstrap.js',