[Pkg-mozext-commits] [all-in-one-sidebar] 21/49: Major: remove old toolbar configuration scripts
David Prévot
taffit at moszumanska.debian.org
Fri Sep 19 16:46:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository all-in-one-sidebar.
commit 84bba309a4211ebbb65c2ec8fb854b0030de832d
Author: Ingo Wennemaring <github at addonlab.com>
Date: Tue Apr 22 15:04:29 2014 +0200
Major: remove old toolbar configuration scripts
---
chrome.manifest | 7 ----
content/aios_customize.xul | 13 -------
content/aios_tbx.js | 35 ------------------
content/aios_tbx_customize.js | 86 -------------------------------------------
4 files changed, 141 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
index aa1e074..71e8d92 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -49,13 +49,6 @@ style chrome://browser/content/browser.xul chrom
style chrome://browser/content/browser.xul chrome://aios/skin/css/aios_buttons_winnt.css os=WINNT
style chrome://browser/content/browser.xul chrome://aios/skin/css/aios_buttons_darwin.css os=Darwin
-
-overlay chrome://global/content/customizeToolbar.xul chrome://aios/content/aios_customize.xul
-style chrome://global/content/customizeToolbar.xul chrome://aios/skin/css/aios_buttons_generic.css
-style chrome://global/content/customizeToolbar.xul chrome://aios/skin/css/aios_buttons_winnt.css os=WINNT
-style chrome://global/content/customizeToolbar.xul chrome://aios/skin/css/aios_buttons_darwin.css os=Darwin
-
-
overlay chrome://browser/content/bookmarks/bookmarksPanel.xul chrome://aios/content/places.xul
style chrome://browser/content/bookmarks/bookmarksPanel.xul chrome://aios/skin/css/places.css
diff --git a/content/aios_customize.xul b/content/aios_customize.xul
deleted file mode 100644
index b02fd80..0000000
--- a/content/aios_customize.xul
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-
-<overlay id="aiosOverlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <!-- scripts -->
- <script type="application/x-javascript" src="chrome://aios/content/_common.js" />
- <script type="application/x-javascript" src="chrome://aios/content/aios_tbx_customize.js" />
- <script type="application/x-javascript" src="chrome://aios/content/aios_compatibility.js" />
-
- <!-- Elements - taken from TotalToolbar 1.8 by alta88 */ -->
- <window id="CustomizeToolbarWindow" persist="screenX screenY width height"/>
-
-</overlay>
\ No newline at end of file
diff --git a/content/aios_tbx.js b/content/aios_tbx.js
index 312588c..8a19bf1 100644
--- a/content/aios_tbx.js
+++ b/content/aios_tbx.js
@@ -1,38 +1,3 @@
-
-/* Clean up options from root doc for removed or empty toolbars */
-/* Original: handleOptions() => taken from TotalToolbar 1.8 by alta88 */
-function handleOptions(aType, toolbar, aNavToolbox) {
- if (toolbar.localName != "toolbar")
- return;
- let attr = "_toolbar." + toolbar.id + ".";
- let toolbarOptions = ["mode",
- "iconsize",
- "fullscreentoolbar",
- "flexbuttons",
- "collapsed"];
-
- var docElt = aNavToolbox.ownerDocument.documentElement;
-
- toolbarOptions.forEach(function(option) {
- if (docElt.hasAttribute(attr + option)) {
- if (aType == "remove") {
- if (toolbar.hasAttribute(option)) {
- // Remove global iconsize/mode options.
- toolbar.removeAttribute(option);
- }
- // Remove customtoolbar options.
- docElt.removeAttribute(attr + option);
- aNavToolbox.ownerDocument.persist(docElt.id, attr + option);
- }
- if (aType == "copy") {
- let val = docElt.getAttribute(attr + option);
- toolbar.setAttribute(option, val);
- }
- }
- });
-}
-
-
/*
Breite der vertikalen Toolboxen freigeben bzw. festsetzen
=> Aufruf durch aios_toggleToolbar(), aios_setToolbarView(), aios_setToolbarPos(), aios_customizeToolbar() und aios_BrowserFullScreen()
diff --git a/content/aios_tbx_customize.js b/content/aios_tbx_customize.js
deleted file mode 100644
index 5a1a93b..0000000
--- a/content/aios_tbx_customize.js
+++ /dev/null
@@ -1,86 +0,0 @@
-
-// fuer CSS-Zwecke speichern
-aios_appInfo( document.getElementById('CustomizeToolbarWindow') );
-
-
-/**
- * Breite der vertikalen Toolbar bei jeder Aenderung der Toolbox (Drag 'n Drop) neu definieren
- **/
-var fx_toolboxChanged = toolboxChanged;
-toolboxChanged = function() {
- fx_toolboxChanged();
- aios_WIN.aios_adjustToolboxWidth();
-};
-
-
-/**
- * Positionierung des Dialogs unter Mac OS X verhindern
- **/
-if(aios_appOS != "Darwin") repositionDialog = function(aWindow) {
- // Always use persisted dimensions and position!
- return;
-}
-
-
-/**
- * Restore the default set of buttons to fixed toolbars,
- * remove all custom toolbars, and rebuild the palette.
- */
-/* Original: restoreDefaultSet() => taken from TotalToolbar 1.8 by alta88 */
-restoreDefaultSet = function () {
- // Unwrap the items on the toolbar.
- unwrapToolbarItems();
-
- // Remove all of the customized toolbars.
- forEachCustomizableToolbar(function (toolbar) {
- let customIndex = toolbar.getAttribute("customindex");
- if (customIndex) {
- // Clean up any customizations from the root doc.
- aios_WIN.handleOptions("remove", toolbar, gToolbox);
-
- // Reset externalToolbars list.
- let newExternalToolbars = [];
- gToolbox.externalToolbars.forEach(function (extToolbar, index) {
- if (extToolbar.id != toolbar.id)
- newExternalToolbars.push(extToolbar);
- });
- gToolbox.externalToolbars = newExternalToolbars;
-
- let toolbox = toolbar.parentNode;
- toolbox.toolbarset.removeAttribute("toolbar"+customIndex);
- gToolboxDocument.persist(toolbox.toolbarset.id, "toolbar"+customIndex);
- toolbar.currentSet = "__empty";
- toolbox.removeChild(toolbar);
- --toolbox.customToolbarCount;
- }
- });
-
- // mod by exxile: Werte fuer AiOS-Toolbar zuruecksetzen => bevor defaultset zurueckgesetzt wird => sonst fehler (zu viele separators)
- aios_WIN.aios_setToolbarPos(1);
- aios_WIN.aios_toolbar.setAttribute('flexbuttons', 'false');
-
- // Restore the defaultset for fixed toolbars.
- forEachCustomizableToolbar(function (toolbar) {
- var defaultSet = toolbar.getAttribute("defaultset");
- if (defaultSet)
- toolbar.currentSet = defaultSet;
-
- // Remove any contextmenu options.
- aios_WIN.handleOptions("remove", toolbar, gToolbox);
- });
-
- // Restore the default icon size and mode.
- document.getElementById("smallicons").checked = (updateIconSize() == "small");
- document.getElementById("modelist").value = updateToolbarMode();
-
- // Now rebuild the palette.
- buildPalette();
-
- // Now re-wrap the items on the toolbar.
- wrapToolbarItems();
-
- toolboxChanged("reset");
-
- // mod by exxile: Iconsize der Sidebarheader-Toolbar zuruecksetzen => nachdem die globale Groesse zurueckgesetzt wurde
- aios_WIN.document.getElementById('aios-sbhtoolbar').setAttribute('iconsize', 'small');
-}
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/all-in-one-sidebar.git
More information about the Pkg-mozext-commits
mailing list