From 19db5c8e7458b364471e7ed749422594fdc77b79 Mon Sep 17 00:00:00 2001 From: "philringnalda%gmail.com" Date: Wed, 20 Dec 2006 06:45:09 +0000 Subject: [PATCH] Bug 363043: Unfork Sb's customizeToolbar, r=jminta --- calendar/resources/content/calendar.js | 7 ++++++- calendar/resources/jar.mn | 2 +- calendar/sunbird/base/jar.mn | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js index 00d847d75732..0461e204482f 100644 --- a/calendar/resources/content/calendar.js +++ b/calendar/resources/content/calendar.js @@ -471,9 +471,14 @@ function CalendarCustomizeToolbar() var cmd = document.getElementById("cmd_CustomizeToolbars"); cmd.setAttribute("disabled", "true"); - + +#ifdef MOZILLA_1_8_BRANCH window.openDialog("chrome://calendar/content/customizeToolbar.xul", "CustomizeToolbar", "chrome,all,dependent", document.getElementById("calendar-toolbox")); +#else + window.openDialog("chrome://global/content/customizeToolbar.xul", "CustomizeToolbar", + "chrome,all,dependent", document.getElementById("calendar-toolbox")); +#endif } function CalendarToolboxCustomizeDone(aToolboxChanged) diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn index dfb5cc4bc663..99324ec26384 100644 --- a/calendar/resources/jar.mn +++ b/calendar/resources/jar.mn @@ -4,7 +4,7 @@ calendar.jar: % content calendar %content/calendar/ * content/calendar/applicationUtil.js (content/applicationUtil.js) content/calendar/attachFile.js (content/attachFile.js) - content/calendar/calendar.js (content/calendar.js) +* content/calendar/calendar.js (content/calendar.js) content/calendar/calendarUtils.js (content/calendarUtils.js) content/calendar/calendarMail.js (content/calendarMail.js) content/calendar/calendarManagement.js (content/calendarManagement.js) diff --git a/calendar/sunbird/base/jar.mn b/calendar/sunbird/base/jar.mn index 0d3db9842067..e6e7ebf28857 100644 --- a/calendar/sunbird/base/jar.mn +++ b/calendar/sunbird/base/jar.mn @@ -5,7 +5,11 @@ calendar.jar: * content/calendar/aboutDialog.xul (content/aboutDialog.xul) * content/calendar/calendar.xul (content/calendar.xul) * content/calendar/credits.xhtml (content/credits.xhtml) +#ifdef MOZILLA_1_8_BRANCH * content/calendar/customizeToolbar.xul (content/customizeToolbar.xul) +#else +% style chrome://global/content/customizeToolbar.xul chrome://calendar/skin/calendar.css +#endif * content/calendar/hiddenWindow.xul (content/hiddenWindow.xul) * content/calendar/hiddenWindow.js (content/hiddenWindow.js) #ifdef MOZ_USE_GENERIC_BRANDING