You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ca...@apache.org on 2007/01/06 11:45:59 UTC
svn commit: r493443 - in
/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource:
ThemeIE/theme.js ThemeOffice/theme.js ThemePanel/theme.js
Author: cagatay
Date: Sat Jan 6 02:45:58 2007
New Revision: 493443
URL: http://svn.apache.org/viewvc?view=rev&rev=493443
Log:
Patch for TOMAHAWK-845. Fixes the jscookmenu image loading issues when cookies are disabled in IE. Thanks to Fabrizio Giustina for the patch.
Modified:
myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeIE/theme.js
myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeOffice/theme.js
myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemePanel/theme.js
Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeIE/theme.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeIE/theme.js?view=diff&rev=493443&r1=493442&r2=493443
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeIE/theme.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeIE/theme.js Sat Jan 6 02:45:58 2007
@@ -4,6 +4,20 @@
if(myThemeIEBase)
cmThemeIEBase = myThemeIEBase;
+var myPrefix = cmThemeIEBase;
+var mySuffix="";
+
+// sub menu display attributes
+if(cmThemeIEBase.indexOf("/;j")>-1){
+ myPrefix=cmThemeIEBase.substring(0,cmThemeIEBase.indexOf("/;j")) + "/";
+ mySuffix=cmThemeIEBase.substring(cmThemeIEBase.indexOf("/;j")+1);
+}
+
+var myFolderLeft=myPrefix + 'folder.gif' + mySuffix;
+var myFolderRight=myPrefix + 'arrow.gif' + mySuffix;
+var myItemLeft=myPrefix + 'link.gif' + mySuffix;
+
+
var cmThemeIE =
{
// main menu display attributes
@@ -26,11 +40,11 @@
// sub menu display attributes
// HTML code to the left of the folder item
- folderLeft: '<img alt="" src="' + cmThemeIEBase + 'folder.gif">',
+ folderLeft: '<img alt="" src="' + myFolderLeft + '">',
// HTML code to the right of the folder item
- folderRight: '<img alt="" src="' + cmThemeIEBase + 'arrow.gif">',
+ folderRight: '<img alt="" src="' + myFolderRight + '">',
// HTML code to the left of the regular item
- itemLeft: '<img alt="" src="' + cmThemeIEBase + 'link.gif">',
+ itemLeft: '<img alt="" src="' + myItemLeft + '">',
// HTML code to the right of the regular item
itemRight: '',
// cell spacing for main menu
Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeOffice/theme.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeOffice/theme.js?view=diff&rev=493443&r1=493442&r2=493443
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeOffice/theme.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemeOffice/theme.js Sat Jan 6 02:45:58 2007
@@ -4,6 +4,21 @@
if(myThemeOfficeBase)
cmThemeOfficeBase = myThemeOfficeBase;
+var myPrefix = cmThemeOfficeBase;
+var mySuffix="";
+
+// sub menu display attributes
+if(cmThemeOfficeBase.indexOf("/;j")>-1){
+ myPrefix=cmThemeOfficeBase.substring(0,cmThemeOfficeBase.indexOf("/;j")) + "/";
+ mySuffix=cmThemeOfficeBase.substring(cmThemeOfficeBase.indexOf("/;j")+1);
+}
+
+var myFolderLeft=myPrefix + 'spacer.gif' + mySuffix;
+var myFolderRight=myPrefix + 'arrow.gif' + mySuffix;
+var myItemLeft=myPrefix + 'spacer.gif' + mySuffix;
+var myItemRight=myPrefix + 'blank.gif' + mySuffix;
+
+
var cmThemeOffice =
{
// main menu display attributes
@@ -26,13 +41,13 @@
// sub menu display attributes
// 0, HTML code to the left of the folder item
- folderLeft: '<img alt="" src="' + cmThemeOfficeBase + 'spacer.gif">',
+ folderLeft: '<img alt="" src="' + myFolderLeft + '">',
// 1, HTML code to the right of the folder item
- folderRight: '<img alt="" src="' + cmThemeOfficeBase + 'arrow.gif">',
+ folderRight: '<img alt="" src="' + myFolderRight + '">',
// 2, HTML code to the left of the regular item
- itemLeft: '<img alt="" src="' + cmThemeOfficeBase + 'spacer.gif">',
+ itemLeft: '<img alt="" src="' + myItemLeft + '">',
// 3, HTML code to the right of the regular item
- itemRight: '<img alt="" src="' + cmThemeOfficeBase + 'blank.gif">',
+ itemRight: '<img alt="" src="' + myItemRight + '">',
// 4, cell spacing for main menu
mainSpacing: 0,
// 5, cell spacing for sub menus
Modified: myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemePanel/theme.js
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemePanel/theme.js?view=diff&rev=493443&r1=493442&r2=493443
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemePanel/theme.js (original)
+++ myfaces/tomahawk/trunk/core/src/main/resources/org/apache/myfaces/custom/navmenu/jscookmenu/resource/ThemePanel/theme.js Sat Jan 6 02:45:58 2007
@@ -5,6 +5,20 @@
if(myThemePanelBase)
cmThemePanelBase = myThemePanelBase;
+var myPrefix = cmThemePanelBase;
+var mySuffix="";
+
+// sub menu display attributes
+if(cmThemePanelBase.indexOf("/;j")>-1){
+ myPrefix=cmThemePanelBase.substring(0,cmThemePanelBase.indexOf("/;j")) + "/";
+ mySuffix=cmThemePanelBase.substring(cmThemePanelBase.indexOf("/;j")+1);
+}
+
+var myFolderLeft=myPrefix + 'blank.gif' + mySuffix;
+var myFolderRight=myPrefix + 'arrow.gif' + mySuffix;
+var myItemLeft=myPrefix + 'blank.gif' + mySuffix;
+var myItemRight=myPrefix + 'blank.gif' + mySuffix;
+
var cmThemePanel =
{
// main menu display attributes
@@ -16,24 +30,24 @@
// a separate TD cell.
// HTML code to the left of the folder item
- mainFolderLeft: '<img alt="" src="' + cmThemePanelBase + 'blank.gif">',
+ mainFolderLeft: '<img alt="" src="' + myFolderLeft + '">',
// HTML code to the right of the folder item
- mainFolderRight: '<img alt="" src="' + cmThemePanelBase + 'arrow.gif">',
+ mainFolderRight: '<img alt="" src="' + myFolderRight + '">',
// HTML code to the left of the regular item
- mainItemLeft: '<img alt="" src="' + cmThemePanelBase + 'blank.gif">',
+ mainItemLeft: '<img alt="" src="' + myItemLeft + '">',
// HTML code to the right of the regular item
- mainItemRight: '<img alt="" src="' + cmThemePanelBase + 'blank.gif">',
+ mainItemRight: '<img alt="" src="' + myItemRight + '">',
// sub menu display attributes
// HTML code to the left of the folder item
- folderLeft: '<img alt="" src="' + cmThemePanelBase + 'blank.gif">',
+ folderLeft: '<img alt="" src="' + myFolderLeft + '">',
// HTML code to the right of the folder item
- folderRight: '<img alt="" src="' + cmThemePanelBase + 'arrow.gif">',
+ folderRight: '<img alt="" src="' + myFolderRight + '">',
// HTML code to the left of the regular item
- itemLeft: '<img alt="" src="' + cmThemePanelBase + 'blank.gif">',
+ itemLeft: '<img alt="" src="' + myItemLeft + '">',
// HTML code to the right of the regular item
- itemRight: '<img alt="" src="' + cmThemePanelBase + 'blank.gif">',
+ itemRight: '<img alt="" src="' + myItemRight + '">',
// cell spacing for main menu
mainSpacing: 0,
// cell spacing for sub menus