From d181a3934366e604235fdbc1f8fe83fe678dfd10 Mon Sep 17 00:00:00 2001 From: perploug Date: Wed, 21 Aug 2013 21:11:15 +0200 Subject: [PATCH] Added 1.2 references to app.js and dev.app.js --- src/Umbraco.Web.UI.Client/src/app.dev.js | 11 ++- src/Umbraco.Web.UI.Client/src/app.js | 8 +- src/Umbraco.Web.UI.Client/src/loader.js | 73 +++++++++++-------- .../test/config/app.unit.js | 9 ++- .../test/config/karma.conf.js | 18 ++++- src/Umbraco.Web/UI/JavaScript/JsInitialize.js | 15 +++- 6 files changed, 92 insertions(+), 42 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/app.dev.js b/src/Umbraco.Web.UI.Client/src/app.dev.js index e6fce84ffb..f31386d572 100644 --- a/src/Umbraco.Web.UI.Client/src/app.dev.js +++ b/src/Umbraco.Web.UI.Client/src/app.dev.js @@ -5,6 +5,13 @@ var app = angular.module('umbraco', [ 'umbraco.services', 'umbraco.httpbackend', 'ngCookies', - 'ngRoute', + 'ngMobile' 'ui.sortable' -]); \ No newline at end of file +]); + + +/* For Angular 1.2: we need to load in Route, animate and touch seperately + 'ngRoute', + 'ngAnimate', + 'ngTouch' +*/ \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/app.js b/src/Umbraco.Web.UI.Client/src/app.js index 2bebe9ba87..2dca81433a 100644 --- a/src/Umbraco.Web.UI.Client/src/app.js +++ b/src/Umbraco.Web.UI.Client/src/app.js @@ -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' +*/ \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/src/loader.js b/src/Umbraco.Web.UI.Client/src/loader.js index 7b35404a1f..25dee79aca 100644 --- a/src/Umbraco.Web.UI.Client/src/loader.js +++ b/src/Umbraco.Web.UI.Client/src/loader.js @@ -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 () { diff --git a/src/Umbraco.Web.UI.Client/test/config/app.unit.js b/src/Umbraco.Web.UI.Client/test/config/app.unit.js index 9e9ad823c1..fd29fd30b8 100644 --- a/src/Umbraco.Web.UI.Client/test/config/app.unit.js +++ b/src/Umbraco.Web.UI.Client/test/config/app.unit.js @@ -5,6 +5,9 @@ var app = angular.module('umbraco', [ 'umbraco.services', 'umbraco.mocks', 'umbraco.security', - 'ngCookies', - 'ngRoute' -]); \ No newline at end of file + 'ngCookies' +]); + +/* For Angular 1.2: we need to load in Routing seperately + 'ngRoute' +*/ \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js index 9fc40d4710..4ea46037a0 100644 --- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js +++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js @@ -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', diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js index 0226bb56e7..e60dc4cddc 100644 --- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js +++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js @@ -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',