Merge remote-tracking branch 'justin/FLUID-5209'

* justin/FLUID-5209: FLUID-5209: Adding namespaces to listeners in the Prefs Framework
fluid-project · Aug 30, 2016 · b11549a · b11549a
2 parents 40a8e02 + 52c495d
commit b11549a
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/src/framework/preferences/js/Enactors.js b/src/framework/preferences/js/Enactors.js
@@ -387,7 +387,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
                         }
                     },
                     listeners: {
-                        afterRender: "{fluid.prefs.enactor.tableOfContents}.events.afterTocRender"
+                        "afterRender.boilAfterTocRender": "{fluid.prefs.enactor.tableOfContents}.events.afterTocRender"
                     }
                 }
             }

diff --git a/src/framework/preferences/js/FullNoPreviewPrefsEditor.js b/src/framework/preferences/js/FullNoPreviewPrefsEditor.js
@@ -26,12 +26,14 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
                 container: "{that}.container",
                 options: {
                     listeners: {
-                        afterReset: [{
+                        "afterReset.applyChanges": {
                             listener: "{that}.applyChanges"
-                        }, {
-                            listener: "{that}.save"
-                        }],
-                        onReady: {
+                        },
+                        "afterReset.save": {
+                            listener: "{that}.save",
+                            priority: "after:applyChanges"
+                        },
+                        "onReady.boilOnReady": {
                             listener: "{fullNoPreview}.events.onReady",
                             args: "{fullNoPreview}"
                         }

diff --git a/src/framework/preferences/js/FullPreviewPrefsEditor.js b/src/framework/preferences/js/FullPreviewPrefsEditor.js
@@ -34,13 +34,13 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
                             container: "{prefsEditor}.dom.previewFrame",
                             options: {
                                 listeners: {
-                                    onReady: "{fullPreview}.events.onPreviewReady"
+                                    "onReady.boilOnPreviewReady": "{fullPreview}.events.onPreviewReady"
                                 }
                             }
                         }
                     },
                     listeners: {
-                        onReady: "{fullPreview}.events.onPrefsEditorReady"
+                        "onReady.boilOnPrefsEditorReady": "{fullPreview}.events.onPrefsEditorReady"
                     },
                     distributeOptions: {
                         source: "{that}.options.preview",

diff --git a/src/framework/preferences/js/Panels.js b/src/framework/preferences/js/Panels.js
@@ -810,7 +810,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
             }
         },
         listeners: {
-            afterRender: "{that}.style"
+            "afterRender.style": "{that}.style"
         },
         selectors: {
             themeRow: ".flc-prefsEditor-themeRow",
@@ -984,7 +984,7 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
     fluid.defaults("fluid.prefs.selectDecorator", {
         gradeNames: ["fluid.viewComponent"],
         listeners: {
-            onCreate: "fluid.prefs.selectDecorator.decorateOptions"
+            "onCreate.decorateOptions": "fluid.prefs.selectDecorator.decorateOptions"
         },
         styles: {
             preview: "fl-preview-theme"

diff --git a/src/framework/preferences/js/SeparatedPanelPrefsEditor.js b/src/framework/preferences/js/SeparatedPanelPrefsEditor.js
@@ -62,11 +62,11 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
             iframe: ".flc-prefsEditor-iframe"
         },
         listeners: {
-            onReady: {
+            "onReady.bindEvents": {
                 listener: "fluid.prefs.separatedPanel.bindEvents",
                 args: ["{separatedPanel}.prefsEditor", "{iframeRenderer}.iframeEnhancer", "{separatedPanel}"]
             },
-            onCreate: {
+            "onCreate.hideReset": {
                 listener: "fluid.prefs.separatedPanel.hideReset",
                 args: ["{separatedPanel}"]
             }
@@ -150,13 +150,13 @@ var fluid_2_0_0 = fluid_2_0_0 || {};
                         updateEnhancerModel: "{that}.events.modelChanged"
                     },
                     listeners: {
-                        modelChanged: "{that}.save",
-                        onCreate: {
+                        "modelChanged.save": "{that}.save",
+                        "onCreate.bindReset": {
                             listener: "{separatedPanel}.bindReset",
                             args: ["{that}.reset"]
                         },
-                        afterReset: "{that}.applyChanges",
-                        onReady: {
+                        "afterReset.applyChanges": "{that}.applyChanges",
+                        "onReady.boilOnReady": {
                             listener: "{separatedPanel}.events.onReady",
                             args: "{separatedPanel}"
                         }