From d59963a53e8cf2dda10f33e0ed250f35c5496c6b Mon Sep 17 00:00:00 2001 From: perploug Date: Wed, 4 Sep 2013 15:43:00 +0200 Subject: [PATCH] Comment jquery UI for new sorter --- src/Umbraco.Web.UI.Client/src/loader.js | 10 ++++++---- src/Umbraco.Web/UI/JavaScript/JsInitialize.js | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/loader.js b/src/Umbraco.Web.UI.Client/src/loader.js index 81da6904be..46629a2e2d 100644 --- a/src/Umbraco.Web.UI.Client/src/loader.js +++ b/src/Umbraco.Web.UI.Client/src/loader.js @@ -4,14 +4,15 @@ yepnope({ '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 */ + /* 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.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.ui.draggable.js', + 'lib/jquery/jquery.ui.draggable.js',*/ /* 1.1.5 */ 'lib/angular/1.1.5/angular.min.js', @@ -29,7 +30,8 @@ yepnope({ */ /* temporary sorter lib, should be updated */ - 'lib/angular/angular-ui-sortable.js', + /*'lib/angular/angular-ui-sortable.js',*/ + 'lib/jquery/jquery.sortable/jquery.sortable.js', /* App-wide file-upload helper */ 'lib/jquery/jquery.upload/js/jquery.fileupload.js', diff --git a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js index ba64a19c64..41d33459c2 100644 --- a/src/Umbraco.Web/UI/JavaScript/JsInitialize.js +++ b/src/Umbraco.Web/UI/JavaScript/JsInitialize.js @@ -5,10 +5,11 @@ /* 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.ui.effect-highlight.min.js',*/ /* 1.1.5 */ 'lib/angular/1.1.5/angular.min.js', @@ -23,8 +24,9 @@ 'lib/angular/1.2/angular-animate.min.js', */ - /* temporary sorter lib, should be updated */ - 'lib/angular/angular-ui-sortable.js', + /* temporary sorter lib, should be updated + 'lib/angular/angular-ui-sortable.js',*/ + 'lib/jquery/jquery.sortable/jquery.sortable.js', /* App-wide file-upload helper */ 'lib/jquery/jquery.upload/js/jquery.fileupload.js',