Merge with the master

firebug · Feb 10, 2014 · de48614 · de48614
2 parents 7a77df2 + 5d7de24
commit de48614
Show file tree

Hide file tree

Showing 18 changed files with 171 additions and 157 deletions.
diff --git a/extension/content/firebug/branch.properties b/extension/content/firebug/branch.properties
@@ -1,8 +1,8 @@
-# DO NOT MERGE INTO TRUNK
-RELEASE=.0a8
-VERSION=1.13.jsd2
-TRUNK=
-# To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com
-# the root of the fbug svn tree must be be at the same level as the root of getfirebug.com
-# Otherwise specify your own path.
+# DO NOT MERGE INTO TRUNK
+RELEASE=.0a9
+VERSION=1.13.jsd2
+TRUNK=
+# To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com
+# the root of the fbug svn tree must be be at the same level as the root of getfirebug.com
+# Otherwise specify your own path.
 GETFIREBUG=../../../../getfirebug.com/tags/production
diff --git a/extension/content/firebug/console/consolePanel.js b/extension/content/firebug/console/consolePanel.js
@@ -337,6 +337,8 @@ ConsolePanel.prototype = Obj.extend(ActivablePanel,
                 "console.option.tip.Show_Network_Errors"),
             this.getShowStackTraceMenuItem(),
             this.getStrictOptionMenuItem(),
+            Menu.optionMenu("console.option.Group_Log_Messages", "console.groupLogMessages",
+                "console.option.tip.Group_Log_Messages"),
             "-",
             Menu.optionMenu("console.option.Show_Command_Editor", "commandEditor",
                 "console.option.tip.Show_Command_Editor"),

diff --git a/extension/content/firebug/cookies/cookie.js b/extension/content/firebug/cookies/cookie.js
@@ -64,8 +64,8 @@ Cookie.prototype =
             new String(this.cookie.isDomain).toUpperCase() + "\t" +
             this.cookie.path + "\t" +
             new String(this.cookie.isSecure).toUpperCase() + "\t" +
-            this.cookie.expires + "\t" +
-            this.cookie.maxAge + "\t" +
+            (this.cookie.expires ? this.cookie.expires + "\t" : "") +
+            (this.cookie.maxAge ? this.cookie.maxAge + "\t" : "") +
             this.cookie.name + "\t" +
             this.cookie.rawValue + "\r\n";
     },

diff --git a/extension/content/firebug/lib/url.js b/extension/content/firebug/lib/url.js
@@ -3,8 +3,9 @@
 define([
     "firebug/lib/trace",
     "firebug/lib/string",
+    "firebug/lib/options",
 ],
-function (FBTrace, Str) {
+function (FBTrace, Str, Options) {
 
 "use strict";
 
@@ -498,7 +499,8 @@ Url.parseURLEncodedText = function(text, noLimit)
         }
     }
 
-    params.sort(function(a, b) { return a.name <= b.name ? -1 : 1; });
+    if (Options.get("netSortPostParameters"))
+        params.sort((a, b) => { return a.name <= b.name ? -1 : 1; });
 
     return params;
 };

diff --git a/extension/content/firebug/net/netReps.js b/extension/content/firebug/net/netReps.js
@@ -1299,6 +1299,9 @@ Firebug.NetMonitor.NetInfoPostData = domplate(Rep, new EventSource(),
                             Locale.$STR("net.label.Parameters"),
                             SPAN({"class": "netInfoPostContentType"},
                                 "application/x-www-form-urlencoded"
+                            ),
+                            A({"class": "netPostParameterSort", onclick: "$onChangeSort"},
+                                "$object|getLabel"
                             )
                         )
                     )
@@ -1417,13 +1420,22 @@ Firebug.NetMonitor.NetInfoPostData = domplate(Rep, new EventSource(),
             )
         ),
 
+    getLabel: function(object)
+    {
+        return Options.get("netSortPostParameters") ?
+            Locale.$STR("netParametersDoNotSort") :
+            Locale.$STR("netParametersSortAlphabetically");
+    },
+
     getParamValueIterator: function(param)
     {
         return Firebug.NetMonitor.NetInfoBody.getParamValueIterator(param);
     },
 
     render: function(context, parentNode, file)
     {
+        Dom.clearNode(parentNode);
+
         var text = NetUtils.getPostText(file, context, true);
         if (text == undefined)
             return;
@@ -1472,7 +1484,7 @@ Firebug.NetMonitor.NetInfoPostData = domplate(Rep, new EventSource(),
         if (!params || !params.length)
             return;
 
-        var paramTable = this.paramsTable.append(null, parentNode);
+        var paramTable = this.paramsTable.append({object: null}, parentNode);
         var row = paramTable.getElementsByClassName("netInfoPostParamsTitle").item(0);
 
         Firebug.NetMonitor.NetInfoBody.headerDataTag.insertRows({headers: params}, row);
@@ -1578,7 +1590,21 @@ Firebug.NetMonitor.NetInfoPostData = domplate(Rep, new EventSource(),
         }
 
         return postData;
-    }
+    },
+
+    onChangeSort: function(event)
+    {
+        var target = event.target;
+        var netInfoBox = Dom.getAncestorByClass(target, "netInfoBody");
+        var panel = Firebug.getElementPanel(netInfoBox);
+        var file = Firebug.getRepObject(netInfoBox);
+        var postText = netInfoBox.getElementsByClassName("netInfoPostText").item(0);
+
+        Options.togglePref("netSortPostParameters");
+        Firebug.NetMonitor.NetInfoPostData.render(panel.context, postText, file);
+
+        Events.cancelEvent(event);
+    },
 });
 
 // ********************************************************************************************* //

diff --git a/extension/defaults/preferences/firebug.js b/extension/defaults/preferences/firebug.js
@@ -143,6 +143,7 @@ pref("extensions.firebug.netResponseHeadersVisible", true);
 pref("extensions.firebug.netRequestHeadersVisible", true);
 pref("extensions.firebug.netCachedHeadersVisible", false);
 pref("extensions.firebug.netPostRequestHeadersVisible", false);
+pref("extensions.firebug.netSortPostParameters", true);
 
 // JSON Preview
 pref("extensions.firebug.sortJsonPreview", false);

diff --git a/extension/install.rdf b/extension/install.rdf
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>firebug@software.joehewitt.com</em:id>
-    <em:version>1.13.0a8</em:version>
-    <em:type>2</em:type>
-    <em:bootstrap>true</em:bootstrap>
-
-    <!-- Any suitably modern toolkit application -->
-    <em:targetApplication>
-      <Description>
-        <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>26.0</em:minVersion>
-        <em:maxVersion>29.0</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <!-- Firefox -->
-    <em:targetApplication>
-      <Description>
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>26.0</em:minVersion>
-        <em:maxVersion>29.0</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <em:name>Firebug</em:name>
-    <em:description>Web Development Evolved. Firebug is free and open source software distributed under the BSD License.</em:description>
-    <em:creator>Joe Hewitt</em:creator>
-    <em:contributor>John J. Barton (IBM Almaden)</em:contributor>
-    <em:contributor>Jan Odvarko (Mozilla Corp.)</em:contributor>
-    <em:contributor>Max Stepanov (Aptana Inc.)</em:contributor>
-    <em:contributor>Rob Campbell (Mozilla Corp.)</em:contributor>
-    <em:contributor>Hans Hillen (Paciello Group, Mozilla)</em:contributor>
-    <em:contributor>Curtis Bartley (Mozilla Corp.)</em:contributor>
-    <em:contributor>Mike Collins (IBM Almaden)</em:contributor>
-    <em:contributor>Kevin Decker</em:contributor>
-    <em:contributor>Mike Ratcliffe (Mozilla Corp.)</em:contributor>
-    <em:contributor>Hernan Rodriguez Colmeiro</em:contributor>
-    <em:contributor>Austin Andrews</em:contributor>
-    <em:contributor>Christoph Dorn</em:contributor>
-    <em:contributor>Steven Roussey (Illuminations for Developers)</em:contributor>
-    <em:contributor>Sebastian Zartner</em:contributor>
-    <em:contributor>Harutyun Amirjanyan</em:contributor>
-    <em:contributor>Simon Lindholm</em:contributor>
-    <em:contributor>Stampolidis Anastasios</em:contributor>
-    <em:contributor>Joe Walker (Mozilla Corp.)</em:contributor>
-    <em:contributor>Vladimir Zhuravlev</em:contributor>
-    <em:contributor>Farshid Beheshti</em:contributor>
-    <em:contributor>Leon Sorokin</em:contributor>
-    <em:contributor>Florent Fayolle</em:contributor>
-    <em:contributor>Hector Zhao</em:contributor>
-    <em:contributor>Bharath Thiruveedula</em:contributor>
-    <em:contributor>Nathan Mische</em:contributor>
-    <em:contributor>Belakhdar Abdeldjalil</em:contributor>
-    <em:contributor>Jakob Kaltenbrunner</em:contributor>
-
-    <em:iconURL>chrome://firebug/skin/firebugBig.png</em:iconURL>
-    <em:homepageURL>http://www.getfirebug.com/</em:homepageURL>
-    <em:updateURL>https://getfirebug.com/releases/firebug/1.13/update.rdf</em:updateURL>
-
-    <em:translator>Leszek(teo)Zyczkowski (pl-PL)</em:translator>
-    <em:translator>markh (nl)</em:translator>
-    <em:translator>peter3 (sv-SE)</em:translator>
-    <em:translator>AlleyKat (da-DK)</em:translator>
-    <em:translator>Hector Zhao, lovelywcm (zh-CN)</em:translator>
-    <em:translator>Lukas Kucharczyk, Michal Kec (cs-CZ)</em:translator>
-    <em:translator>Team erweiterungen.de, ReinekeFux, Benedikt Langens, Sebastian Zartner (de-DE)</em:translator>
-    <em:translator>l0stintranslation, gonzalopirobutirro, Luigi Grilli (it-IT)</em:translator>
-    <em:translator>alexxed (ro-RO)</em:translator>
-    <em:translator>Nicolas Martin, Franck Marcia (fr-FR)</em:translator>
-    <em:translator>gLes (hu-HU)</em:translator>
-    <em:translator>Xavi Ivars - Softcatala (ca)</em:translator>
-    <em:translator>gezmen (tr-TR)</em:translator>
-    <em:translator>eternoendless (es-AR)</em:translator>
-    <em:translator>Dark Preacher (ru)</em:translator>
-    <em:translator>Tiago Oliveira, Diego de Carvalho Zimmermann, Alexandre Rapaki (pt-BR)</em:translator>
-    <em:translator>Juan Botias, Alvaro G. Vicario (es-ES)</em:translator>
-    <em:translator>Andriy Zhouck (uk-UA)</em:translator>
-    <em:translator>Hisateru Tanaka, k2jp (ja-JP)</em:translator>
-    <em:translator>Mohsen Shadroo (fa-IR)</em:translator>
-    <em:translator>Eduard Babayan (hy-AM)</em:translator>
-    <em:translator>Helder Magalhaes (pt-PT)</em:translator>
-    <em:translator>Tomaz Macus (sl-SI)</em:translator>
-    <em:translator>Stoyan Stefanov, Alexander Shopov (bg)</em:translator>
-    <em:translator>Kristjan Bjarni Guomundsson (is-IS)</em:translator>
-    <em:translator>NGUYEN Manh Hung (vi-VN)</em:translator>
-    <em:translator>Bwah (hr-HR)</em:translator>
-    <em:translator>Sonickydon (el)</em:translator>
-    <em:translator>David Gonzales (es)</em:translator>
-    <em:translator>DakSrbija (sr)</em:translator>
-    <em:translator>bootleq (zh-TW)</em:translator>
-    <em:translator>Asier Iturralde Sarasola, Julen Irazoki Oteiza (eu)</em:translator>
-  </Description>
-</RDF>
+<?xml version="1.0" encoding="utf-8"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>firebug@software.joehewitt.com</em:id>
+    <em:version>1.13.0a9</em:version>
+    <em:type>2</em:type>
+    <em:bootstrap>true</em:bootstrap>
+
+    <!-- Any suitably modern toolkit application -->
+    <em:targetApplication>
+      <Description>
+        <em:id>toolkit@mozilla.org</em:id>
+        <em:minVersion>27.0</em:minVersion>
+        <em:maxVersion>30.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Firefox -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+        <em:minVersion>27.0</em:minVersion>
+        <em:maxVersion>30.0</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <em:name>Firebug</em:name>
+    <em:description>Web Development Evolved. Firebug is free and open source software distributed under the BSD License.</em:description>
+    <em:creator>Joe Hewitt</em:creator>
+    <em:contributor>John J. Barton (IBM Almaden)</em:contributor>
+    <em:contributor>Jan Odvarko (Mozilla Corp.)</em:contributor>
+    <em:contributor>Max Stepanov (Aptana Inc.)</em:contributor>
+    <em:contributor>Rob Campbell (Mozilla Corp.)</em:contributor>
+    <em:contributor>Hans Hillen (Paciello Group, Mozilla)</em:contributor>
+    <em:contributor>Curtis Bartley (Mozilla Corp.)</em:contributor>
+    <em:contributor>Mike Collins (IBM Almaden)</em:contributor>
+    <em:contributor>Kevin Decker</em:contributor>
+    <em:contributor>Mike Ratcliffe (Mozilla Corp.)</em:contributor>
+    <em:contributor>Hernan Rodriguez Colmeiro</em:contributor>
+    <em:contributor>Austin Andrews</em:contributor>
+    <em:contributor>Christoph Dorn</em:contributor>
+    <em:contributor>Steven Roussey (Illuminations for Developers)</em:contributor>
+    <em:contributor>Sebastian Zartner</em:contributor>
+    <em:contributor>Harutyun Amirjanyan</em:contributor>
+    <em:contributor>Simon Lindholm</em:contributor>
+    <em:contributor>Stampolidis Anastasios</em:contributor>
+    <em:contributor>Joe Walker (Mozilla Corp.)</em:contributor>
+    <em:contributor>Vladimir Zhuravlev</em:contributor>
+    <em:contributor>Farshid Beheshti</em:contributor>
+    <em:contributor>Leon Sorokin</em:contributor>
+    <em:contributor>Florent Fayolle</em:contributor>
+    <em:contributor>Hector Zhao</em:contributor>
+    <em:contributor>Bharath Thiruveedula</em:contributor>
+    <em:contributor>Nathan Mische</em:contributor>
+    <em:contributor>Belakhdar Abdeldjalil</em:contributor>
+    <em:contributor>Jakob Kaltenbrunner</em:contributor>
+
+    <em:iconURL>chrome://firebug/skin/firebug64.png</em:iconURL>
+    <em:homepageURL>http://www.getfirebug.com/</em:homepageURL>
+    <em:updateURL>https://getfirebug.com/releases/firebug/1.13/update.rdf</em:updateURL>
+
+    <em:translator>Leszek(teo)Zyczkowski (pl-PL)</em:translator>
+    <em:translator>markh (nl)</em:translator>
+    <em:translator>peter3 (sv-SE)</em:translator>
+    <em:translator>AlleyKat (da-DK)</em:translator>
+    <em:translator>Hector Zhao, lovelywcm (zh-CN)</em:translator>
+    <em:translator>Lukas Kucharczyk, Michal Kec (cs-CZ)</em:translator>
+    <em:translator>Team erweiterungen.de, ReinekeFux, Benedikt Langens, Sebastian Zartner (de-DE)</em:translator>
+    <em:translator>l0stintranslation, gonzalopirobutirro, Luigi Grilli (it-IT)</em:translator>
+    <em:translator>alexxed (ro-RO)</em:translator>
+    <em:translator>Nicolas Martin, Franck Marcia (fr-FR)</em:translator>
+    <em:translator>gLes (hu-HU)</em:translator>
+    <em:translator>Xavi Ivars - Softcatala (ca)</em:translator>
+    <em:translator>gezmen (tr-TR)</em:translator>
+    <em:translator>eternoendless (es-AR)</em:translator>
+    <em:translator>Dark Preacher (ru)</em:translator>
+    <em:translator>Tiago Oliveira, Diego de Carvalho Zimmermann, Alexandre Rapaki (pt-BR)</em:translator>
+    <em:translator>Juan Botias, Alvaro G. Vicario (es-ES)</em:translator>
+    <em:translator>Andriy Zhouck (uk-UA)</em:translator>
+    <em:translator>Hisateru Tanaka, k2jp (ja-JP)</em:translator>
+    <em:translator>Mohsen Shadroo (fa-IR)</em:translator>
+    <em:translator>Eduard Babayan (hy-AM)</em:translator>
+    <em:translator>Helder Magalhaes (pt-PT)</em:translator>
+    <em:translator>Tomaz Macus (sl-SI)</em:translator>
+    <em:translator>Stoyan Stefanov, Alexander Shopov (bg)</em:translator>
+    <em:translator>Kristjan Bjarni Guomundsson (is-IS)</em:translator>
+    <em:translator>NGUYEN Manh Hung (vi-VN)</em:translator>
+    <em:translator>Bwah (hr-HR)</em:translator>
+    <em:translator>Sonickydon (el)</em:translator>
+    <em:translator>David Gonzales (es)</em:translator>
+    <em:translator>DakSrbija (sr)</em:translator>
+    <em:translator>bootleq (zh-TW)</em:translator>
+    <em:translator>Asier Iturralde Sarasola, Julen Irazoki Oteiza (eu)</em:translator>
+  </Description>
+</RDF>
diff --git a/extension/install.rdf.tpl.xml b/extension/install.rdf.tpl.xml
@@ -13,17 +13,17 @@
     <em:targetApplication>
       <Description>
         <em:id>toolkit@mozilla.org</em:id>
-        <em:minVersion>26.0</em:minVersion>
-        <em:maxVersion>29.0</em:maxVersion>
+        <em:minVersion>27.0</em:minVersion>
+        <em:maxVersion>30.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 
     <!-- Firefox -->
     <em:targetApplication>
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-        <em:minVersion>26.0</em:minVersion>
-        <em:maxVersion>29.0</em:maxVersion>
+        <em:minVersion>27.0</em:minVersion>
+        <em:maxVersion>30.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 

diff --git a/extension/locale/Makefile.in b/extension/locale/Makefile.in
diff --git a/extension/locale/en-US/firebug.properties b/extension/locale/en-US/firebug.properties
@@ -118,6 +118,8 @@ ShowNetworkErrors=Show Network Errors
 console.option.tip.Show_Network_Errors=Log network error messages into the console
 JavascriptOptionsStrict=Strict Warnings (performance penalty)
 console.option.tip.Show_Strict_Warnings=Log also strict warnings into the console
+console.option.Group_Log_Messages=Group Log Messages
+console.option.tip.Group_Log_Messages=Group equal log messages in the console
 Command_History=Command History
 console.option.Show_Command_Editor=Show Command Editor
 console.option.tip.Show_Command_Editor=Switch to the Command Editor
@@ -1034,6 +1036,9 @@ net.summary.tip.total_size=Total size of all requests
 net.summary.tip.total_cached_size=Total cached size of all requests
 net.summary.tip.total_request_time=Total time needed to load all requests and time when the 'onload' event occurred
 
+netParametersSortAlphabetically=Sort alphabetically
+netParametersDoNotSort=Do not sort
+
 StopLoading=Stop Loading
 net.tip.Stop_Loading=Stop loading the request
 LargeData=(Very Large Data)