GTNPORTAL-3412 HTML5 data-* attributes not compatible with XHTML 1.0

ichsteffen · Mar 21, 2014 · ea597c1 · ea597c1
1 parent 590f437
commit ea597c1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/mobile-integration/portlets/header/src/main/webapp/js/menu.js b/mobile-integration/portlets/header/src/main/webapp/js/menu.js
@@ -7,14 +7,19 @@
     $(".gtnResponsiveMenuCollapseButton").each(function(){
 
             $(this).click(function(){
-                if ($(this).data("target") && $(this).data("target-class") && $(this).data("action") == "toggleCSS")
+                var dataTarget = $(this).children(".data.target").first();
+                var dataTargetClass = $(this).children(".data.target.class").first();
+                var dataAction = $(this).children(".data.action").first();
+                var dataSelfClass = $(this).children(".data.self.class").first();
+
+                if (dataTarget && dataTargetClass && dataAction.val() == "toggleCSS")
                 {
-                    $($(this).data("target")).toggleClass($(this).data("target-class"));
+                    $(dataTarget.val()).toggleClass(dataTargetClass.val());
                 }
 
-                if ($(this).data("self-class") && $(this).data("action") == "toggleCSS")
+                if (dataSelfClass && dataAction.val() == "toggleCSS")
                 {
-                    $(this).toggleClass($(this).data("self-class"));
+                    $(this).toggleClass(dataSelfClass.val());
                 }
             });
 

diff --git a/mobile-integration/portlets/header/src/main/webapp/jsp/header.jsp b/mobile-integration/portlets/header/src/main/webapp/jsp/header.jsp
@@ -41,9 +41,12 @@ jsMan.require("SHARED/org_gatein_responsive_menu", "menu").addScripts("menu.init
 <div id="<portlet:namespace/>_gtnResponsiveHeaderPortlet" class="gtnResponsiveHeaderPortlet">
     <div class="collapsibleRow clearfix">
         <div id="<portlet:namespace/>_logo" class="logo" onclick="window.location = '${homePageLink}';"><span class="skipHidden">GateIn</span></div>
-        <div id="<portlet:namespace/>_icon" class="gtnResponsiveMenuCollapseButton"
-            data-target="#<portlet:namespace/>_options" data-action="toggleCSS" data-target-class="display"
-            data-self-class="enabled"><div class="collapseButtonIcon" title="${resourceBundle.getString('label.ShowGroupPages')}"></div>
+        <div id="<portlet:namespace/>_icon" class="gtnResponsiveMenuCollapseButton">
+            <input type="hidden" class="data target" value="#<portlet:namespace/>_options" />
+            <input type="hidden" class="data action" value="toggleCSS" />
+            <input type="hidden" class="data target class" value="display" />
+            <input type="hidden" class="data self class" value="enabled" />
+            <div class="collapseButtonIcon" title="${resourceBundle.getString('label.ShowGroupPages')}"></div>
         </div>
         <div id="<portlet:namespace/>_options" class="gtnResponsiveMenu options collapsibleContent collapsibleRow">
             <ol class="menu">