FLOE-331: Upgrade the infusion library.

fluid-project · Sep 19, 2015 · 3310a05 · 3310a05
1 parent 0b74ee2
commit 3310a05
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/lib/infusion/VERSION.md b/src/lib/infusion/VERSION.md
@@ -1,8 +1,8 @@
-The version of Infusion included in this folder was created using a custom build from the infusion master branch:
+The version of Infusion included in this folder was created using a custom build from this branch:
 
-https://github.com/fluid-project/infusion
+https://github.com/cindyli/infusion/tree/FLUID-5770
 
-commit#: f63bc7741175afaa166cb90e68a735aeae93ed9d
+commit#: af5e328dbd5e0bc6996e269fbad7062421ad3457
 
 ```
 grunt custom --source=true --include="preferences, tooltip"

diff --git a/src/lib/infusion/infusion-custom.js b/src/lib/infusion/infusion-custom.js
@@ -1,4 +1,4 @@
-/*! infusion - v2.0.0-SNAPSHOT Friday, September 18th, 2015, 10:44:27 AM*/
+/*! infusion - v2.0.0-SNAPSHOT Friday, September 18th, 2015, 11:36:40 AM*/
 /*!
  * jQuery JavaScript Library v1.11.0
  * http://jquery.com/
@@ -32658,15 +32658,15 @@ var fluid_2_0 = fluid_2_0 || {};
 
     /**
      * Saves the current model and fires onSave
- */
+     */
     fluid.prefs.prefsEditor.save = function (that) {
         if (!that.model) {  // Don't save a reset model
             return;
         }
 
         var initialModel = that.initialModel,
             userSelections = fluid.copy(that.model),
-            changedSelections = {};
+            changedPrefs = {};
 
         // Only save the changed preferences so the future default value change on preferences can still be correctly merged with changed preferences
         if (fluid.model.diff(userSelections.preferences, initialModel.preferences)) {
@@ -32677,13 +32677,17 @@ var fluid_2_0 = fluid_2_0 || {};
             fluid.model.diff(userSelections.preferences, fluid.get(that.initialModel, ["preferences"]), stats);
 
             fluid.each(stats.changeMap, function (state, path) {
-                fluid.set(changedSelections, ["preferences", path], userSelections.preferences[path]);
+                fluid.set(changedPrefs, path, userSelections.preferences[path]);
             });
+
+            if (stats.changes > 0) {
+                userSelections.preferences = changedPrefs;
+            }
         }
 
-        that.events.onSave.fire(changedSelections);
-        that.setSettings(changedSelections);
-        return changedSelections;
+        that.events.onSave.fire(userSelections);
+        that.setSettings(userSelections);
+        return userSelections;
     };
 
     fluid.prefs.prefsEditor.saveAndApply = function (that) {