From 93e77d49e908b92ed3fb8184c871a334b76b7090 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 8 Jul 2016 15:44:47 -0400 Subject: [PATCH] (js,css) Replace sortable library --- NEWS | 1 + UI/Templates/PreferencesUI/UIxPreferences.wox | 18 +- UI/Templates/SchedulerUI/UIxCalMainView.wox | 49 ++++-- UI/WebServerResources/Gruntfile.js | 2 +- UI/WebServerResources/bower.json | 2 +- .../js/Preferences/Preferences.app.js | 2 +- .../js/Scheduler/CalendarsController.js | 28 ++- .../js/Scheduler/Scheduler.app.js | 2 +- .../js/vendor/ng-sortable.min.js | 3 +- .../js/vendor/ng-sortable.min.js.map | 2 +- .../scss/components/list/list.scss | 165 +++++++----------- 11 files changed, 121 insertions(+), 153 deletions(-) diff --git a/NEWS b/NEWS index 6d9f3c3fe..34aa85bed 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ Enhancements - [web] all batch operations can now be performed on selected messages in advanced search mode - [web] add date picker to change date, week, or month of current Calendar view - [web] style cancelled events in Calendar module + - [web] replace sortable library for better support with Firefox - [oc] better handling of nested attachments with OpenChange Bug fixes diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index 9d1f51b16..1ad67389e 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -8,7 +8,7 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="title" - const:jsFiles="Common.js, vendor/ng-sortable.min.js, Preferences.js, Preferences.services.js, Mailer.services.js, Contacts.services.js, vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js"> + const:jsFiles="vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/ng-sortable.min.js, Common.js, Preferences.js, Preferences.services.js, Mailer.services.js, Contacts.services.js">
@@ -675,13 +675,16 @@ -
- -
+
- + ng-repeat="item in app.preferences.defaults.SOGoSieveFilters" + as-sortable-item="as-sortable-item"> + drag_handle
-
-
+ diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 3474d1eea..e78ebb0e4 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -8,7 +8,7 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="title" - const:jsFiles="vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, Common.js, vendor/ng-sortable.min.js, Preferences.services.js, Contacts.services.js, Mailer.services.js, vendor/angular-file-upload.min.js, Scheduler.js, Scheduler.services.js, vendor/FileSaver.min.js"> + const:jsFiles="vendor/ckeditor/ckeditor.js, vendor/ckeditor/ck.js, vendor/ng-sortable.min.js, Common.js, Preferences.services.js, Contacts.services.js, Mailer.services.js, vendor/angular-file-upload.min.js, Scheduler.js, Scheduler.services.js, vendor/FileSaver.min.js">