Merge branch 'demo' into FLUID-4323-demo

Conflicts: src/webapp/integration-demos/uiOptions/ClimateChange.html
fluid-project · Mar 26, 2013 · aa7a095 · aa7a095
2 parents abe7a4c + 34cf2e5
commit aa7a095
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 10 deletions.
diff --git a/src/webapp/integration-demos/uiOptions/ClimateChange.html b/src/webapp/integration-demos/uiOptions/ClimateChange.html
@@ -86,9 +86,9 @@
         <!-- END markup for fat-panel UI Options -->
 
         <div id="content">
-            <nav class="flc-toc-tocContainer toc"> </nav>
+            <div class="flc-toc-tocContainer toc"> </div>
+            <div id="container" class="flc-uiOptions-content">
 
-            <div id="container">
                 <header id="header" class="dotGovSub">
                     <div id="headTitle">
                         <span class="fl-hidden-accessible">NOAA Office of Education</span>
@@ -813,7 +813,6 @@ <h5><a href="#">Time and Tides</a></h5>
                         <div style="clear:both;"></div>
 
                     </aside>
-
                 </div>
 
             </div>

diff --git a/src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js b/src/webapp/integration-demos/uiOptions/js/uiOptionsDemo.js
@@ -5,9 +5,15 @@
     var pathToTocTemplate = "../../components/tableOfContents/html/TableOfContents.html";
     var pathToTemplates = "../../components/uiOptions/html/";
 
+    var extraSiteSettings = {
+            simplifiedContent: false,
+            selfVoicing: false
+        };
+
     demo.initPageEnhancer = function (customThemeName) {
         fluid.pageEnhancer({
             gradeNames: ["fluid.uiEnhancer.defaultActions", "fluid.uiEnhancer.extraActions"],
+            defaultSiteSettings: extraSiteSettings,
             tocTemplate: pathToTocTemplate,
             classnameMap: {
                 theme: {
@@ -33,6 +39,9 @@
                         selfVoicing: "templates/UIOptionsTemplate-selfVoicing.html"
                     }
                 }
+            },
+            outerEnhancerOptions: {
+                defaultSiteSettings: extraSiteSettings
             }
         });
     };

diff --git a/src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js b/src/webapp/integration-demos/uiOptions/js/uiOptionsExtra.js
@@ -125,6 +125,9 @@ var fluid_1_5 = fluid_1_5 || {};
     // Note that the implementors need to provide the container for this view component
     fluid.defaults("fluid.uiOptions.actionAnts.simplifiedContentEnactor", {
         gradeNames: ["fluid.viewComponent", "fluid.uiOptions.actionAnts", "autoInit"],
+        selectors: {
+            content: ".flc-uiOptions-content"
+        },
         model: {
             value: false
         },
@@ -143,21 +146,29 @@ var fluid_1_5 = fluid_1_5 || {};
     });
 
     fluid.uiOptions.actionAnts.simplifiedContentEnactor.set = function (value, that) {
-        if (!that.initialContent) {
-            that.initialContent = that.container.html();
+        contentContainer = that.container.find(that.options.selectors.content);
+
+        if (!that.initialContent || !that.article) {
+            that.initialContent = contentContainer.html();
+            var article = contentContainer.find("article").html();
+            that.article = article ? article : that.initialContent;
         }
 
         if (value) {
-            that.container.html(that.container("article").html());
+            if (contentContainer.html() !== that.article) {
+                contentContainer.html(that.article);
+            }
         } else {
-            that.container.html(that.initialContent);
+            if (contentContainer.html() !== that.initialContent) {
+                contentContainer.html(that.initialContent);
+            }
         }
     };
 
     fluid.uiOptions.actionAnts.simplifiedContentEnactor.finalInit = function (that) {
-//        that.applier.modelChanged.addListener("value", function (newModel) {
-//            that.set(newModel.value);
-//        });
+        that.applier.modelChanged.addListener("value", function (newModel) {
+            that.set(newModel.value);
+        });
     };
 
     /*******************************************************************************