From 949edaa94da47187157230acc5a16b05a81c3a11 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 20 Aug 2018 10:41:21 -0400
Subject: [PATCH] (js) Fix trigger when ordering mail filters

Cont'd.
---
 UI/Templates/PreferencesUI/UIxPreferences.wox          |  2 +-
 .../js/Preferences/PreferencesController.js            | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 45afb9c93..b50711488 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -721,7 +721,7 @@
             <md-content role="tabpanel" aria-labelledby="mailFiltersView">
               <div class="sg-list-sortable"
                    ng-model="app.preferences.defaults.SOGoSieveFilters"
-                   as-sortable="{ scrollableContainer: '.sg-list-sortable', containment: '.sg-list-sortable', containerPositioning: 'relative', orderChanged: preferencesForm.$setDirty() }">
+                   as-sortable="{ scrollableContainer: '.sg-list-sortable', containment: '.sg-list-sortable', containerPositioning: 'relative', orderChanged: app.onFiltersOrderChanged(preferencesForm) }">
                 <div layout="row" layout-align="start center"
                      ng-repeat="item in app.preferences.defaults.SOGoSieveFilters"
                      as-sortable-item="as-sortable-item">
diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js
index b92f9cc0d..391f25393 100644
--- a/UI/WebServerResources/js/Preferences/PreferencesController.js
+++ b/UI/WebServerResources/js/Preferences/PreferencesController.js
@@ -227,6 +227,16 @@
       form.$setDirty();
     };
 
+    this.onFiltersOrderChanged = function(form) {
+      // Return a callback that will affect the form
+      if (!this._onFiltersOrderChanged) {
+        this._onFiltersOrderChanged = function(type) {
+          form.$setDirty();
+        };
+      }
+      return this._onFiltersOrderChanged;
+    };
+
     this.addDefaultEmailAddresses = function(form) {
       var v = [];