Bug 930845 - Removed expander binding, expander.css and expander.xml; r=enn
authorLucius Q. User <snprintfv@gmail.com>
Fri, 05 Jan 2018 19:09:21 +0100
changeset 449826 be780bf2c08a71780495c15d95b1cfc03c89b6a1
parent 449825 e2501f2e295ebfc91ed5db1b0c16f70f443669f3
child 449827 c713ef0ecf0966e392acd6fe6d790c8844b70ec5
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersenn
bugs930845
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 930845 - Removed expander binding, expander.css and expander.xml; r=enn MozReview-Commit-ID: 26oF9gSQZVt
toolkit/content/jar.mn
toolkit/content/widgets/expander.xml
toolkit/content/xul.css
toolkit/themes/shared/non-mac.jar.inc.mn
toolkit/themes/windows/global/expander.css
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -72,17 +72,16 @@ toolkit.jar:
    content/global/bindings/datekeeper.js       (widgets/datekeeper.js)
    content/global/bindings/datepicker.js       (widgets/datepicker.js)
    content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)
    content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)
    content/global/bindings/datetimebox.xml     (widgets/datetimebox.xml)
    content/global/bindings/datetimebox.css     (widgets/datetimebox.css)
 *  content/global/bindings/dialog.xml          (widgets/dialog.xml)
    content/global/bindings/editor.xml          (widgets/editor.xml)
-   content/global/bindings/expander.xml        (widgets/expander.xml)
    content/global/bindings/filefield.xml       (widgets/filefield.xml)
 *  content/global/bindings/findbar.xml         (widgets/findbar.xml)
    content/global/bindings/general.xml         (widgets/general.xml)
    content/global/bindings/groupbox.xml        (widgets/groupbox.xml)
    content/global/bindings/listbox.xml         (widgets/listbox.xml)
    content/global/bindings/menu.xml            (widgets/menu.xml)
    content/global/bindings/menulist.xml        (widgets/menulist.xml)
    content/global/bindings/notification.xml    (widgets/notification.xml)
deleted file mode 100644
--- a/toolkit/content/widgets/expander.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<bindings id="expanderBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xbl="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="expander" display="xul:vbox">
-    <resources>
-      <stylesheet src="chrome://global/skin/expander.css"/>
-    </resources>
-    <content>
-      <xul:hbox align="center">
-        <xul:button type="disclosure" class="expanderButton" anonid="disclosure" xbl:inherits="disabled" mousethrough="always"/>
-        <xul:label class="header expanderButton" anonid="label" xbl:inherits="value=label,disabled" mousethrough="always" flex="1"/>
-        <xul:button anonid="clear-button" xbl:inherits="label=clearlabel,disabled=cleardisabled,hidden=clearhidden" mousethrough="always" icon="clear"/>
-      </xul:hbox>
-      <xul:vbox flex="1" anonid="settings" class="settingsContainer" collapsed="true" xbl:inherits="align">
-        <children/>
-      </xul:vbox>
-    </content>
-    <implementation>
-      <constructor><![CDATA[
-        var settings = document.getAnonymousElementByAttribute(this, "anonid", "settings");
-        var expander = document.getAnonymousElementByAttribute(this, "anonid", "disclosure");
-        var open = this.getAttribute("open") == "true";
-        settings.collapsed = !open;
-        expander.open = open;
-      ]]></constructor>
-      <property name="open">
-        <setter>
-          <![CDATA[
-            var settings = document.getAnonymousElementByAttribute(this, "anonid", "settings");
-            var expander = document.getAnonymousElementByAttribute(this, "anonid", "disclosure");
-            settings.collapsed = !val;
-            expander.open = val;
-            if (val)
-              this.setAttribute("open", "true");
-            else
-              this.setAttribute("open", "false");
-            return val;
-          ]]>
-        </setter>
-        <getter>
-          return this.getAttribute("open");
-        </getter>
-      </property>        
-      <method name="onCommand">
-        <parameter name="aEvent"/>
-        <body><![CDATA[
-          var element = aEvent.originalTarget;
-          var button = element.getAttribute("anonid");
-          switch (button) {
-          case "disclosure":
-          case "label":
-            if (this.open == "true")
-              this.open = false;
-            else
-              this.open = true;
-            break;
-          case "clear-button":
-            var event = document.createEvent("Events");
-            event.initEvent("clear", true, true);
-            this.dispatchEvent(event);
-            break;
-          }
-        ]]></body>
-      </method>
-    </implementation>
-    <handlers>
-      <handler event="command"><![CDATA[
-        this.onCommand(event);
-      ]]></handler>
-      <handler event="click"><![CDATA[
-        if (event.originalTarget.localName == "label")
-          this.onCommand(event);
-      ]]></handler>
-    </handlers>
-  </binding>
-          
-</bindings>
-
-          
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -1010,24 +1010,16 @@ wizardpage {
 .wizard-header {
   -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard-header");
 }
 
 .wizard-buttons {
   -moz-binding: url("chrome://global/content/bindings/wizard.xml#wizard-buttons");
 }
 
-/********** expander ********/
-
-expander {
-  -moz-binding: url("chrome://global/content/bindings/expander.xml#expander");
-  -moz-box-orient: vertical;
-}
-
-
 /********** Rich Listbox ********/
 
 richlistbox {
   -moz-binding: url('chrome://global/content/bindings/richlistbox.xml#richlistbox');
   -moz-user-focus: normal;
   -moz-box-orient: vertical;
 }
 
--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -8,17 +8,16 @@
 # As a result, the source file paths are relative to the location of the
 # actual manifests.
 
 #include jar.inc.mn
 
   skin/classic/global/customizeToolbar.css                 (../../windows/global/customizeToolbar.css)
   skin/classic/global/datetimepicker.css                   (../../windows/global/datetimepicker.css)
   skin/classic/global/dialog.css                           (../../windows/global/dialog.css)
-  skin/classic/global/expander.css                         (../../windows/global/expander.css)
   skin/classic/global/filefield.css                        (../../windows/global/filefield.css)
   skin/classic/global/progressmeter.css                    (../../windows/global/progressmeter.css)
   skin/classic/global/resizer.css                          (../../windows/global/resizer.css)
   skin/classic/global/richlistbox.css                      (../../windows/global/richlistbox.css)
   skin/classic/global/scrollbars.css                       (../../windows/global/xulscrollbars.css)
   skin/classic/global/spinbuttons.css                      (../../windows/global/spinbuttons.css)
   skin/classic/global/tabprompts.css                       (../../windows/global/tabprompts.css)
   skin/classic/global/wizard.css                           (../../windows/global/wizard.css)
deleted file mode 100644
--- a/toolkit/themes/windows/global/expander.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-.expanderButton {
-  cursor: pointer !important;
-}
-
-.settingsContainer {
-  padding-top: 3px;
-  padding-bottom: 5px;
-  padding-inline-start: 20px;
-  padding-inline-end: 5px;
-}