From dff0290b3879c8f2306c6d3c82e249f2261d3ef3 Mon Sep 17 00:00:00 2001 From: Patrick Brosset Date: Sat, 20 Jun 2015 14:51:50 +0200 Subject: [PATCH 01/39] Bug 938188 - Make highlighter capable of highlighting only one region, fading out others. r=bgrins Introduced a new highlighter option that makes each region element in the highlighter only cover the actual area of the corresponding region, excluding the area of nested regions. This is useful when used with the existing showOnly region because it lets users see exactly where a given region is. This patch makes the layout-view use this new option, so that when users hover over the various regions in the layout-view, only the corresponding regions are highlighted. --- .../browser_inspector_highlighter-options.js | 40 ++++++ browser/devtools/layoutview/view.js | 6 +- .../devtools/server/actors/highlighter.css | 6 + toolkit/devtools/server/actors/highlighter.js | 115 ++++++++++++------ 4 files changed, 132 insertions(+), 35 deletions(-) diff --git a/browser/devtools/inspector/test/browser_inspector_highlighter-options.js b/browser/devtools/inspector/test/browser_inspector_highlighter-options.js index c4331514b175..7b4f3e37c114 100644 --- a/browser/devtools/inspector/test/browser_inspector_highlighter-options.js +++ b/browser/devtools/inspector/test/browser_inspector_highlighter-options.js @@ -143,6 +143,46 @@ const TEST_DATA = [ is(Math.floor(bottomY1), points[2][1], "Bottom guide's y1 is correct"); is(Math.ceil(leftX1), points[3][0], "Left guide's x1 is correct"); } + }, + { + desc: "When showOnly is used, other regions can be faded", + options: {showOnly: "margin", onlyRegionArea: true}, + checkHighlighter: function*(toolbox) { + let h = toolbox.highlighter; + + for (let region of ["margin", "border", "padding", "content"]) { + let {d} = yield getHighlighterRegionPath(region, h); + ok(d, "Region " + region + " is shown (it has a d attribute)"); + + let faded = yield getHighlighterNodeAttribute(h, + "box-model-" + region, "faded"); + if (region === "margin") { + ok(!faded, "The margin region is not faded"); + } else { + is(faded, "true", "Region " + region + " is faded"); + } + } + } + }, + { + desc: "When showOnly is used, other regions can be faded (2)", + options: {showOnly: "padding", onlyRegionArea: true}, + checkHighlighter: function*(toolbox) { + let h = toolbox.highlighter; + + for (let region of ["margin", "border", "padding", "content"]) { + let {d} = yield getHighlighterRegionPath(region, h); + ok(d, "Region " + region + " is shown (it has a d attribute)"); + + let faded = yield getHighlighterNodeAttribute(h, + "box-model-" + region, "faded"); + if (region === "padding") { + ok(!faded, "The padding region is not faded"); + } else { + is(faded, "true", "Region " + region + " is faded"); + } + } + } } ]; diff --git a/browser/devtools/layoutview/view.js b/browser/devtools/layoutview/view.js index 81b5d189647e..0db20508a1a8 100644 --- a/browser/devtools/layoutview/view.js +++ b/browser/devtools/layoutview/view.js @@ -553,7 +553,11 @@ let onmouseover = function(e) { return false; } - this.layoutview.showBoxModel({region}); + this.layoutview.showBoxModel({ + region, + showOnly: region, + onlyRegionArea: true + }); return false; }.bind(window); diff --git a/toolkit/devtools/server/actors/highlighter.css b/toolkit/devtools/server/actors/highlighter.css index b823548d425a..4beb0292ea00 100644 --- a/toolkit/devtools/server/actors/highlighter.css +++ b/toolkit/devtools/server/actors/highlighter.css @@ -35,6 +35,12 @@ opacity: 0.6; } +/* Box model regions can be faded (see the onlyRegionArea option in + highlighter.js) in order to only display certain regions. */ +:-moz-native-anonymous .box-model-regions [faded] { + display: none; +} + :-moz-native-anonymous .box-model-content { fill: #87ceeb; } diff --git a/toolkit/devtools/server/actors/highlighter.js b/toolkit/devtools/server/actors/highlighter.js index 63a6efa18b95..1a0f7c5e412b 100644 --- a/toolkit/devtools/server/actors/highlighter.js +++ b/toolkit/devtools/server/actors/highlighter.js @@ -234,7 +234,8 @@ let HighlighterActor = exports.HighlighterActor = protocol.ActorClass({ region: Option(1), hideInfoBar: Option(1), hideGuides: Option(1), - showOnly: Option(1) + showOnly: Option(1), + onlyRegionArea: Option(1) } }), @@ -1045,7 +1046,12 @@ AutoRefreshHighlighter.prototype = { * Defaults to false * - showOnly {String} * "content", "padding", "border" or "margin" - * If set, only this region will be highlighted + * If set, only this region will be highlighted. Use with onlyRegionArea to + * only highlight the area of the region. + * - onlyRegionArea {Boolean} + * This can be set to true to make each region's box only highlight the area + * of the corresponding region rather than the area of nested regions too. + * This is useful when used with showOnly. * * Structure: *
@@ -1427,49 +1433,90 @@ BoxModelHighlighter.prototype = Heritage.extend(AutoRefreshHighlighter.prototype * True if the current node has a box model to be highlighted */ _updateBoxModel: function() { - this.options.region = this.options.region || "content"; + let options = this.options; + options.region = options.region || "content"; - if (this._nodeNeedsHighlighting()) { - for (let boxType of BOX_MODEL_REGIONS) { - let box = this.getElement(boxType); + if (!this._nodeNeedsHighlighting()) { + this._hideBoxModel(); + return false; + } - if (this.regionFill[boxType]) { - box.setAttribute("style", "fill:" + this.regionFill[boxType]); - } else { - box.setAttribute("style", ""); - } + for (let i = 0; i < BOX_MODEL_REGIONS.length; i++) { + let boxType = BOX_MODEL_REGIONS[i]; + let nextBoxType = BOX_MODEL_REGIONS[i + 1]; + let box = this.getElement(boxType); - if (!this.options.showOnly || this.options.showOnly === boxType) { - // Highlighting all quads. - let path = []; - for (let {p1, p2, p3, p4} of this.currentQuads[boxType]) { - path.push("M" + p1.x + "," + p1.y + " " + - "L" + p2.x + "," + p2.y + " " + - "L" + p3.x + "," + p3.y + " " + - "L" + p4.x + "," + p4.y); - } + if (this.regionFill[boxType]) { + box.setAttribute("style", "fill:" + this.regionFill[boxType]); + } else { + box.setAttribute("style", ""); + } - box.setAttribute("d", path.join(" ")); + // Highlight all quads for this region by setting the "d" attribute of the + // corresponding . + let path = []; + for (let j = 0; j < this.currentQuads[boxType].length; j++) { + let boxQuad = this.currentQuads[boxType][j]; + let nextBoxQuad = this.currentQuads[nextBoxType] + ? this.currentQuads[nextBoxType][j] + : null; + path.push(this._getBoxPathCoordinates(boxQuad, nextBoxQuad)); + } + + box.setAttribute("d", path.join(" ")); + box.removeAttribute("faded"); + + // If showOnly is defined, either hide the other regions, or fade them out + // if onlyRegionArea is set too. + if (options.showOnly && options.showOnly !== boxType) { + if (options.onlyRegionArea) { + box.setAttribute("faded", "true"); } else { box.removeAttribute("d"); } - - if (boxType === this.options.region && !this.options.hideGuides) { - this._showGuides(boxType); - } else if (this.options.hideGuides) { - this._hideGuides(); - } } - // Un-zoom the root wrapper if the page was zoomed. - let rootId = this.ID_CLASS_PREFIX + "root"; - this.markup.scaleRootElement(this.currentNode, rootId); - - return true; + if (boxType === options.region && !options.hideGuides) { + this._showGuides(boxType); + } else if (options.hideGuides) { + this._hideGuides(); + } } - this._hideBoxModel(); - return false; + // Un-zoom the root wrapper if the page was zoomed. + let rootId = this.ID_CLASS_PREFIX + "root"; + this.markup.scaleRootElement(this.currentNode, rootId); + + return true; + }, + + _getBoxPathCoordinates: function(boxQuad, nextBoxQuad) { + let {p1, p2, p3, p4} = boxQuad; + + let path; + if (!nextBoxQuad || !this.options.onlyRegionArea) { + // If this is the content box (inner-most box) or if we're not being asked + // to highlight only region areas, then draw a simple rectangle. + path = "M" + p1.x + "," + p1.y + " " + + "L" + p2.x + "," + p2.y + " " + + "L" + p3.x + "," + p3.y + " " + + "L" + p4.x + "," + p4.y; + } else { + // Otherwise, just draw the region itself, not a filled rectangle. + let {p1: np1, p2: np2, p3: np3, p4: np4} = nextBoxQuad; + path = "M" + p1.x + "," + p1.y + " " + + "L" + p2.x + "," + p2.y + " " + + "L" + p3.x + "," + p3.y + " " + + "L" + p4.x + "," + p4.y + " " + + "L" + p1.x + "," + p1.y + " " + + "L" + np1.x + "," + np1.y + " " + + "L" + np4.x + "," + np4.y + " " + + "L" + np3.x + "," + np3.y + " " + + "L" + np2.x + "," + np2.y + " " + + "L" + np1.x + "," + np1.y; + } + + return path; }, _nodeNeedsHighlighting: function() { From 2cc20c56c072f15dde00a41b0136e965117d78dd Mon Sep 17 00:00:00 2001 From: Florent Fayolle Date: Sat, 20 Jun 2015 08:47:00 +0200 Subject: [PATCH 02/39] Bug 1050691 - Click on a function on the console should go to the debugger. r=jlongster --- .../devtools/shared/widgets/VariablesView.jsm | 2 +- browser/devtools/webconsole/console-output.js | 48 +++++++++++++-- browser/devtools/webconsole/test/browser.ini | 4 ++ ...le_bug_1050691_click_function_to_source.js | 60 +++++++++++++++++++ .../browser_webconsole_closure_inspection.js | 12 +++- ...ebconsole_context_menu_open_in_var_view.js | 51 ++++++++++++++++ browser/devtools/webconsole/test/head.js | 25 +++++++- ...-bug_1050691_click_function_to_source.html | 11 ++++ ...st-bug_1050691_click_function_to_source.js | 10 ++++ browser/devtools/webconsole/webconsole.xul | 2 + .../chrome/browser/devtools/webConsole.dtd | 2 + toolkit/devtools/DevToolsUtils.js | 2 +- toolkit/devtools/server/actors/addon.js | 16 ++--- .../devtools/server/actors/child-process.js | 14 ++--- toolkit/devtools/server/actors/object.js | 19 +++++- toolkit/devtools/server/actors/promises.js | 4 +- toolkit/devtools/server/actors/script.js | 6 +- toolkit/devtools/server/actors/webconsole.js | 7 ++- .../devtools/server/tests/unit/testactors.js | 2 +- 19 files changed, 265 insertions(+), 32 deletions(-) create mode 100644 browser/devtools/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js create mode 100644 browser/devtools/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js create mode 100644 browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html create mode 100644 browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.js diff --git a/browser/devtools/shared/widgets/VariablesView.jsm b/browser/devtools/shared/widgets/VariablesView.jsm index 1e0bad06765e..03a6e5821d12 100644 --- a/browser/devtools/shared/widgets/VariablesView.jsm +++ b/browser/devtools/shared/widgets/VariablesView.jsm @@ -1543,7 +1543,7 @@ Scope.prototype = { * * @param string a * @param string b - * @return number + * @return number * -1 if a is less than b, 0 if no change in order, +1 if a is greater than 0 */ _naturalSort: function(a,b) { diff --git a/browser/devtools/webconsole/console-output.js b/browser/devtools/webconsole/console-output.js index 6bcc869498cf..a3cbeb204218 100644 --- a/browser/devtools/webconsole/console-output.js +++ b/browser/devtools/webconsole/console-output.js @@ -342,6 +342,10 @@ ConsoleOutput.prototype = { this.owner.owner.openLink.apply(this.owner.owner, arguments); }, + openLocationInDebugger: function ({url, line}) { + return this.owner.owner.viewSourceInDebugger(url, line); + }, + /** * Open the variables view to inspect an object actor. * @see JSTerm.openVariablesView() in webconsole.js @@ -2496,6 +2500,8 @@ Widgets.JSObject.prototype = Heritage.extend(Widgets.BaseWidget.prototype, options.onClick = options.href ? this._onClickAnchor : this._onClick; } + options.onContextMenu = options.onContextMenu || this._onContextMenu; + let anchor = this.el("a", { class: options.className, draggable: false, @@ -2504,6 +2510,8 @@ Widgets.JSObject.prototype = Heritage.extend(Widgets.BaseWidget.prototype, this.message._addLinkCallback(anchor, options.onClick); + anchor.addEventListener("contextmenu", options.onContextMenu.bind(this)); + if (options.appendTo) { options.appendTo.appendChild(anchor); } else if (!("appendTo" in options) && this.element) { @@ -2513,16 +2521,38 @@ Widgets.JSObject.prototype = Heritage.extend(Widgets.BaseWidget.prototype, return anchor; }, + openObjectInVariablesView: function() + { + this.output.openVariablesView({ + label: VariablesView.getString(this.objectActor, { concise: true }), + objectActor: this.objectActor, + autofocus: true, + }); + }, + /** * The click event handler for objects shown inline. * @private */ _onClick: function() { - this.output.openVariablesView({ - label: VariablesView.getString(this.objectActor, { concise: true }), - objectActor: this.objectActor, - autofocus: true, + this.openObjectInVariablesView(); + }, + + _onContextMenu: function(ev) { + // TODO offer a nice API for the context menu. + // Probably worth to take a look at Firebug's way + // https://github.com/firebug/firebug/blob/master/extension/content/firebug/chrome/menu.js + let doc = ev.target.ownerDocument; + let cmPopup = doc.getElementById("output-contextmenu"); + let openInVarViewCmd = doc.getElementById("menu_openInVarView"); + let openVarView = this.openObjectInVariablesView.bind(this); + openInVarViewCmd.addEventListener("command", openVarView); + openInVarViewCmd.removeAttribute("disabled"); + cmPopup.addEventListener("popuphiding", function onPopupHiding() { + cmPopup.removeEventListener("popuphiding", onPopupHiding); + openInVarViewCmd.removeEventListener("command", openVarView); + openInVarViewCmd.setAttribute("disabled", "true"); }); }, @@ -2690,6 +2720,16 @@ Widgets.ObjectRenderers.add({ this._text(")"); }, + + _onClick: function () { + let location = this.objectActor.location; + if (location) { + this.output.openLocationInDebugger(location); + } + else { + this.openObjectInVariablesView(); + } + } }); // Widgets.ObjectRenderers.byClass.Function /** diff --git a/browser/devtools/webconsole/test/browser.ini b/browser/devtools/webconsole/test/browser.ini index 3638cd88888e..585dcc38f750 100644 --- a/browser/devtools/webconsole/test/browser.ini +++ b/browser/devtools/webconsole/test/browser.ini @@ -124,6 +124,8 @@ support-files = test-bug-609872-cd-iframe-parent.html test-bug-609872-cd-iframe-child.html test-bug-989025-iframe-parent.html + test-bug_1050691_click_function_to_source.html + test-bug_1050691_click_function_to_source.js test-console-api-stackframe.html test_bug_1010953_cspro.html^headers^ test_bug_1010953_cspro.html @@ -387,3 +389,5 @@ skip-if = e10s # Bug 1042253 - webconsole e10s tests (Linux debug timeout) [browser_webconsole_bug_922212_console_dirxml.js] [browser_webconsole_shows_reqs_in_netmonitor.js] [browser_netmonitor_shows_reqs_in_webconsole.js] +[browser_webconsole_bug_1050691_click_function_to_source.js] +[browser_webconsole_context_menu_open_in_var_view.js] diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js b/browser/devtools/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js new file mode 100644 index 000000000000..528bcdccf7c9 --- /dev/null +++ b/browser/devtools/webconsole/test/browser_webconsole_bug_1050691_click_function_to_source.js @@ -0,0 +1,60 @@ +/* vim:set ts=2 sw=2 sts=2 et: */ +/* 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/. */ + +// Tests that clicking on a function displays its source in the debugger. + +"use strict"; + +const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html"; + +let test = asyncTest(function*() { + yield loadTab(TEST_URI); + let hud = yield openConsole(); + + yield testWithoutDebuggerOpen(hud); + + // Open the Debugger panel. + let debuggerPanel = yield openDebugger(); + // And right after come back to the Console panel. + yield openConsole(); + yield testWithDebuggerOpen(hud, debuggerPanel); +}); + +function* testWithoutDebuggerOpen(hud) { + let clickable = yield printFunction(hud); + let onVariablesViewOpen = hud.jsterm.once("variablesview-fetched"); + synthesizeClick(clickable, hud); + return onVariablesViewOpen; +} + +function* testWithDebuggerOpen(hud, debuggerPanel) { + let clickable = yield printFunction(hud); + let panelWin = debuggerPanel.panelWin; + let onEditorLocationSet = panelWin.once(panelWin.EVENTS.EDITOR_LOCATION_SET); + synthesizeClick(clickable, hud); + yield onEditorLocationSet; + ok(isDebuggerCaretPos(debuggerPanel, 7), + "Clicking on a function should go to its source in the debugger view"); +} + +function synthesizeClick(clickable, hud) { + EventUtils.synthesizeMouse(clickable, 2, 2, {}, hud.iframeWindow); +} + +let printFunction = Task.async(function* (hud) { + hud.jsterm.clearOutput(); + content.wrappedJSObject.foo(); + let [result] = yield waitForMessages({ + webconsole: hud, + messages: [{ + category: CATEGORY_WEBDEV, + severity: SEVERITY_LOG, + }], + }); + let msg = [...result.matched][0]; + let clickable = msg.querySelector("a"); + ok(clickable, "clickable item for object should exist"); + return clickable; +}); diff --git a/browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js b/browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js index 537ef1a72e2e..f5eea6b16633 100644 --- a/browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js +++ b/browser/devtools/webconsole/test/browser_webconsole_closure_inspection.js @@ -39,7 +39,7 @@ function test() return deferred.promise; }); - }) + }); }); } @@ -65,7 +65,15 @@ function onExecuteGetName(aResults) ok(clickable, "clickable object found"); gJSTerm.once("variablesview-fetched", onGetNameFetch); - EventUtils.synthesizeMouse(clickable, 2, 2, {}, gWebConsole.iframeWindow); + let contextMenu = + gWebConsole.iframeWindow.document.getElementById("output-contextmenu"); + waitForContextMenu(contextMenu, clickable, () => { + let openInVarView = contextMenu.querySelector("#menu_openInVarView"); + ok(openInVarView.disabled === false, + "the \"Open In Variables View\" context menu item should be clickable"); + // EventUtils.synthesizeMouseAtCenter seems to fail here in Mac OSX + openInVarView.click(); + }); } function onGetNameFetch(aEvent, aVar) diff --git a/browser/devtools/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js b/browser/devtools/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js new file mode 100644 index 000000000000..e169d61e1e4b --- /dev/null +++ b/browser/devtools/webconsole/test/browser_webconsole_context_menu_open_in_var_view.js @@ -0,0 +1,51 @@ +/* vim:set ts=2 sw=2 sts=2 et: */ +/* 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/. */ + +// Tests that the "Open in Variables View" context menu item is enabled +// only for objects. + +"use strict"; + +const TEST_URI = `data:text/html,`; + +let test = asyncTest(function*() { + yield loadTab(TEST_URI); + let hud = yield openConsole(); + + let [result] = yield waitForMessages({ + webconsole: hud, + messages: [{ + category: CATEGORY_WEBDEV, + severity: SEVERITY_LOG, + count: 2, + text: /foo/ + }], + }); + + let [msgWithText, msgWithObj] = [...result.matched]; + ok(msgWithText && msgWithObj, "Two messages should have appeared"); + + let contextMenu = hud.iframeWindow. + document.getElementById("output-contextmenu"); + let openInVarViewItem = contextMenu.querySelector("#menu_openInVarView"); + let obj = msgWithObj.querySelector(".cm-variable"); + let text = msgWithText.querySelector(".console-string"); + + yield waitForContextMenu(contextMenu, obj, () => { + ok(openInVarViewItem.disabled === false, "The \"Open In Variables View\" " + + "context menu item should be available for objects"); + }, () => { + ok(openInVarViewItem.disabled === true, "The \"Open In Variables View\" " + + "context menu item should be disabled on popup hiding"); + }); + + yield waitForContextMenu(contextMenu, text, () => { + ok(openInVarViewItem.disabled === true, "The \"Open In Variables View\" " + + "context menu item should be disabled for texts"); + }); +}); diff --git a/browser/devtools/webconsole/test/head.js b/browser/devtools/webconsole/test/head.js index ba4dc07093eb..f6893137e740 100644 --- a/browser/devtools/webconsole/test/head.js +++ b/browser/devtools/webconsole/test/head.js @@ -226,6 +226,8 @@ let closeConsole = Task.async(function* (aTab) { */ function waitForContextMenu(aPopup, aButton, aOnShown, aOnHidden) { + let deferred = promise.defer(); + function onPopupShown() { info("onPopupShown"); aPopup.removeEventListener("popupshown", onPopupShown); @@ -245,11 +247,10 @@ function waitForContextMenu(aPopup, aButton, aOnShown, aOnHidden) deferred.resolve(aPopup); } - let deferred = promise.defer(); aPopup.addEventListener("popupshown", onPopupShown); info("wait for the context menu to open"); - let eventDetails = { type: "contextmenu", button: 2}; + let eventDetails = {type: "contextmenu", button: 2}; EventUtils.synthesizeMouse(aButton, 2, 2, eventDetails, aButton.ownerDocument.defaultView); return deferred.promise; @@ -825,7 +826,7 @@ function openDebugger(aOptions = {}) let target = TargetFactory.forTab(aOptions.tab); let toolbox = gDevTools.getToolbox(target); - let dbgPanelAlreadyOpen = toolbox.getPanel("jsdebugger"); + let dbgPanelAlreadyOpen = toolbox && toolbox.getPanel("jsdebugger"); gDevTools.showToolbox(target, "jsdebugger").then(function onSuccess(aToolbox) { let panel = aToolbox.getCurrentPanel(); @@ -856,6 +857,24 @@ function openDebugger(aOptions = {}) return deferred.promise; } +/** + * Returns true if the caret in the debugger editor is placed at the specified + * position. + * @param aPanel The debugger panel. + * @param {number} aLine The line number. + * @param {number} [aCol] The column number. + * @returns {boolean} + */ +function isDebuggerCaretPos(aPanel, aLine, aCol = 1) { + let editor = aPanel.panelWin.DebuggerView.editor; + let cursor = editor.getCursor(); + + // Source editor starts counting line and column numbers from 0. + info("Current editor caret position: " + (cursor.line + 1) + ", " + + (cursor.ch + 1)); + return cursor.line == (aLine - 1) && cursor.ch == (aCol - 1); +} + /** * Wait for messages in the Web Console output. * diff --git a/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html b/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html new file mode 100644 index 000000000000..912e301f02ea --- /dev/null +++ b/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.html @@ -0,0 +1,11 @@ + + + + + Click on function should point to source + + + + + diff --git a/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.js b/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.js new file mode 100644 index 000000000000..1eddf0d6edfe --- /dev/null +++ b/browser/devtools/webconsole/test/test-bug_1050691_click_function_to_source.js @@ -0,0 +1,10 @@ +/** + * this + * is + * a + * function + */ +function foo() { + console.log(foo); +} + diff --git a/browser/devtools/webconsole/webconsole.xul b/browser/devtools/webconsole/webconsole.xul index 27c55358b7ea..79f1c96e9bc3 100644 --- a/browser/devtools/webconsole/webconsole.xul +++ b/browser/devtools/webconsole/webconsole.xul @@ -76,6 +76,8 @@ function goUpdateConsoleCommands() { + diff --git a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd index a6a61d11ff43..b6469146dc9c 100644 --- a/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd +++ b/browser/locales/en-US/chrome/browser/devtools/webConsole.dtd @@ -107,3 +107,5 @@ + + diff --git a/toolkit/devtools/DevToolsUtils.js b/toolkit/devtools/DevToolsUtils.js index 35c14302af80..884798d47caf 100644 --- a/toolkit/devtools/DevToolsUtils.js +++ b/toolkit/devtools/DevToolsUtils.js @@ -50,7 +50,7 @@ exports.reportException = function reportException(aWho, aException) { dump(msg + "\n"); - if (Cu.reportError) { + if (Cu && Cu.reportError) { /* * Note that the xpcshell test harness registers an observer for * console messages, so when we're running tests, this will cause diff --git a/toolkit/devtools/server/actors/addon.js b/toolkit/devtools/server/actors/addon.js index e97755888094..b7a96ede0f46 100644 --- a/toolkit/devtools/server/actors/addon.js +++ b/toolkit/devtools/server/actors/addon.js @@ -25,7 +25,7 @@ function BrowserAddonActor(aConnection, aAddon) { this._addon = aAddon; this._contextPool = new ActorPool(this.conn); this.conn.addActorPool(this._contextPool); - this._threadActor = null; + this.threadActor = null; this._global = null; this._shouldAddNewGlobalAsDebuggee = this._shouldAddNewGlobalAsDebuggee.bind(this); @@ -55,7 +55,7 @@ BrowserAddonActor.prototype = { }, get attached() { - return this._threadActor; + return this.threadActor; }, get global() { @@ -65,7 +65,7 @@ BrowserAddonActor.prototype = { get sources() { if (!this._sources) { dbg_assert(this.threadActor, "threadActor should exist when creating sources."); - this._sources = new TabSources(this._threadActor, this._allowSource); + this._sources = new TabSources(this.threadActor, this._allowSource); } return this._sources; }, @@ -135,11 +135,11 @@ BrowserAddonActor.prototype = { } if (!this.attached) { - this._threadActor = new AddonThreadActor(this.conn, this); - this._contextPool.addActor(this._threadActor); + this.threadActor = new AddonThreadActor(this.conn, this); + this._contextPool.addActor(this.threadActor); } - return { type: "tabAttached", threadActor: this._threadActor.actorID }; + return { type: "tabAttached", threadActor: this.threadActor.actorID }; }, onDetach: function BAA_onDetach() { @@ -147,9 +147,9 @@ BrowserAddonActor.prototype = { return { error: "wrongState" }; } - this._contextPool.removeActor(this._threadActor); + this._contextPool.removeActor(this.threadActor); - this._threadActor = null; + this.threadActor = null; this._sources = null; return { type: "detached" }; diff --git a/toolkit/devtools/server/actors/child-process.js b/toolkit/devtools/server/actors/child-process.js index 878aa2ef02fe..c87ad738b489 100644 --- a/toolkit/devtools/server/actors/child-process.js +++ b/toolkit/devtools/server/actors/child-process.js @@ -18,7 +18,7 @@ function ChildProcessActor(aConnection) { this.conn = aConnection; this._contextPool = new ActorPool(this.conn); this.conn.addActorPool(this._contextPool); - this._threadActor = null; + this.threadActor = null; // Use a see-everything debugger this.makeDebugger = makeDebugger.bind(null, { @@ -56,8 +56,8 @@ ChildProcessActor.prototype = { get sources() { if (!this._sources) { - dbg_assert(this._threadActor, "threadActor should exist when creating sources."); - this._sources = new TabSources(this._threadActor); + dbg_assert(this.threadActor, "threadActor should exist when creating sources."); + this._sources = new TabSources(this.threadActor); } return this._sources; }, @@ -68,9 +68,9 @@ ChildProcessActor.prototype = { this._contextPool.addActor(this._consoleActor); } - if (!this._threadActor) { - this._threadActor = new ChromeDebuggerActor(this.conn, this); - this._contextPool.addActor(this._threadActor); + if (!this.threadActor) { + this.threadActor = new ChromeDebuggerActor(this.conn, this); + this._contextPool.addActor(this.threadActor); } return { @@ -78,7 +78,7 @@ ChildProcessActor.prototype = { name: "Content process", consoleActor: this._consoleActor.actorID, - chromeDebugger: this._threadActor.actorID, + chromeDebugger: this.threadActor.actorID, traits: { highlightable: false, diff --git a/toolkit/devtools/server/actors/object.js b/toolkit/devtools/server/actors/object.js index 4992d27730b1..c894453d0240 100644 --- a/toolkit/devtools/server/actors/object.js +++ b/toolkit/devtools/server/actors/object.js @@ -42,6 +42,8 @@ const OBJECT_PREVIEW_MAX_ITEMS = 10; * Increment the actor's grip depth * - decrementGripDepth * Decrement the actor's grip depth + * - globalDebugObject + * The Debuggee Global Object as given by the ThreadActor */ function ObjectActor(obj, { createValueGrip, @@ -49,7 +51,8 @@ function ObjectActor(obj, { createEnvironmentActor, getGripDepth, incrementGripDepth, - decrementGripDepth + decrementGripDepth, + getGlobalDebugObject }) { dbg_assert(!obj.optimizedOut, "Should not create object actors for optimized out values!"); @@ -60,7 +63,8 @@ function ObjectActor(obj, { createEnvironmentActor, getGripDepth, incrementGripDepth, - decrementGripDepth + decrementGripDepth, + getGlobalDebugObject }; this.iterators = new Set(); } @@ -804,6 +808,17 @@ DebuggerServer.ObjectActorPreviewers = { grip.userDisplayName = hooks.createValueGrip(userDisplayName.value); } + let dbgGlobal = hooks.getGlobalDebugObject(); + if (dbgGlobal) { + let script = dbgGlobal.makeDebuggeeValue(obj.unsafeDereference()).script; + if (script) { + grip.location = { + url: script.url, + line: script.startLine + }; + } + } + return true; }], diff --git a/toolkit/devtools/server/actors/promises.js b/toolkit/devtools/server/actors/promises.js index b3a04285b58a..8d4d7fdb482b 100644 --- a/toolkit/devtools/server/actors/promises.js +++ b/toolkit/devtools/server/actors/promises.js @@ -145,7 +145,9 @@ let PromisesActor = protocol.ActorClass({ sources: () => DevToolsUtils.reportException("PromisesActor", Error("sources not yet implemented")), createEnvironmentActor: () => DevToolsUtils.reportException( - "PromisesActor", Error("createEnvironmentActor not yet implemented")) + "PromisesActor", Error("createEnvironmentActor not yet implemented")), + getGlobalDebugObject: () => DevToolsUtils.reportException( + "PromisesActor", Error("getGlobalDebugObject not yet implemented")), }); this._navigationLifetimePool.addActor(actor); diff --git a/toolkit/devtools/server/actors/script.js b/toolkit/devtools/server/actors/script.js index 04779a87aed3..a3c6d3f3a884 100644 --- a/toolkit/devtools/server/actors/script.js +++ b/toolkit/devtools/server/actors/script.js @@ -462,6 +462,9 @@ ThreadActor.prototype = { }, get globalDebugObject() { + if (!this._parent.window) { + return null; + } return this.dbg.makeGlobalObjectReference(this._parent.window); }, @@ -1676,7 +1679,8 @@ ThreadActor.prototype = { this.createEnvironmentActor(env, pool), promote: () => this.threadObjectGrip(actor), isThreadLifetimePool: () => - actor.registeredPool !== this.threadLifetimePool + actor.registeredPool !== this.threadLifetimePool, + getGlobalDebugObject: () => this.globalDebugObject }); aPool.addActor(actor); aPool.objectActors.set(aValue, actor); diff --git a/toolkit/devtools/server/actors/webconsole.js b/toolkit/devtools/server/actors/webconsole.js index 8311beee7c8d..fd48484386a2 100644 --- a/toolkit/devtools/server/actors/webconsole.js +++ b/toolkit/devtools/server/actors/webconsole.js @@ -305,6 +305,10 @@ WebConsoleActor.prototype = actorPrefix: "console", + get globalDebugObject() { + return this.parentActor.threadActor.globalDebugObject; + }, + grip: function WCA_grip() { return { actor: this.actorID }; @@ -450,7 +454,8 @@ WebConsoleActor.prototype = createValueGrip: v => this.createValueGrip(v), sources: () => DevToolsUtils.reportException("WebConsoleActor", Error("sources not yet implemented")), - createEnvironmentActor: (env) => this.createEnvironmentActor(env) + createEnvironmentActor: (env) => this.createEnvironmentActor(env), + getGlobalDebugObject: () => this.globalDebugObject }); aPool.addActor(actor); return actor.grip(); diff --git a/toolkit/devtools/server/tests/unit/testactors.js b/toolkit/devtools/server/tests/unit/testactors.js index 7e0926888144..695cc4f997a5 100644 --- a/toolkit/devtools/server/tests/unit/testactors.js +++ b/toolkit/devtools/server/tests/unit/testactors.js @@ -95,7 +95,7 @@ TestTabActor.prototype = { actorPrefix: "TestTabActor", get window() { - return { wrappedJSObject: this._global }; + return this._global; }, get url() { From a28e692609a3a090e359168a6f8768efe1a3deba Mon Sep 17 00:00:00 2001 From: Ursula Sarracini Date: Sun, 21 Jun 2015 01:14:51 -0400 Subject: [PATCH 03/39] Bug 1176517 - A white square is hiding text in New Tab tour. r=mardak --- browser/base/content/newtab/newTab.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/browser/base/content/newtab/newTab.css b/browser/base/content/newtab/newTab.css index bae22a33ef75..d3e3ac93d9bd 100644 --- a/browser/base/content/newtab/newTab.css +++ b/browser/base/content/newtab/newTab.css @@ -841,6 +841,10 @@ input[type=button] { max-height: 40px; } +.newtab-intro-image-customize #newtab-customize-panel-anchor { + display: none; +} + .newtab-intro-image-customize .newtab-customize-panel-item:not([selected]):hover { background-color: inherit; color: #7A7A7A; From 125e0a3d1a6d8f2854e5e2197501861c1a7f9732 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eddy=20Bru=C3=ABl?= Date: Mon, 22 Jun 2015 15:17:12 +0200 Subject: [PATCH 04/39] Bug 1171967 - Emit newSource events on ThreadClient instead of DebuggerClient;r=pbrosset --- browser/devtools/debugger/debugger-controller.js | 4 ++-- .../devtools/debugger/test/browser_dbg_chrome-debugging.js | 4 ++-- toolkit/devtools/client/dbg-client.jsm | 6 +++--- toolkit/devtools/server/tests/unit/head_dbg.js | 4 ++-- .../tests/unit/test_get-executable-lines-source-map.js | 2 +- .../devtools/server/tests/unit/test_get-executable-lines.js | 4 ++-- toolkit/devtools/server/tests/unit/test_new_source-01.js | 2 +- ...etBreakpoint-on-column-with-no-offsets-at-end-of-line.js | 2 +- ...Breakpoint-on-column-with-no-offsets-at-end-of-script.js | 2 +- .../unit/test_setBreakpoint-on-column-with-no-offsets.js | 2 +- .../server/tests/unit/test_setBreakpoint-on-column.js | 2 +- .../test_setBreakpoint-on-line-with-multiple-offsets.js | 2 +- .../test_setBreakpoint-on-line-with-multiple-statements.js | 2 +- ...etBreakpoint-on-line-with-no-offsets-at-end-of-script.js | 2 +- .../unit/test_setBreakpoint-on-line-with-no-offsets.js | 2 +- .../server/tests/unit/test_setBreakpoint-on-line.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-01.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-03.js | 4 ++-- toolkit/devtools/server/tests/unit/test_sourcemaps-04.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-05.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-06.js | 4 ++-- toolkit/devtools/server/tests/unit/test_sourcemaps-07.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-08.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-09.js | 2 +- toolkit/devtools/server/tests/unit/test_sourcemaps-13.js | 2 +- 25 files changed, 33 insertions(+), 33 deletions(-) diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js index a5fd702ccb28..54ae20dc2c24 100644 --- a/browser/devtools/debugger/debugger-controller.js +++ b/browser/devtools/debugger/debugger-controller.js @@ -1208,7 +1208,7 @@ SourceScripts.prototype = { connect: function() { dumpn("SourceScripts is connecting..."); this.debuggerClient.addListener("newGlobal", this._onNewGlobal); - this.debuggerClient.addListener("newSource", this._onNewSource); + this.activeThread.addListener("newSource", this._onNewSource); this.activeThread.addListener("blackboxchange", this._onBlackBoxChange); this.activeThread.addListener("prettyprintchange", this._onPrettyPrintChange); this.handleTabNavigation(); @@ -1223,7 +1223,7 @@ SourceScripts.prototype = { } dumpn("SourceScripts is disconnecting..."); this.debuggerClient.removeListener("newGlobal", this._onNewGlobal); - this.debuggerClient.removeListener("newSource", this._onNewSource); + this.activeThread.removeListener("newSource", this._onNewSource); this.activeThread.removeListener("blackboxchange", this._onBlackBoxChange); this.activeThread.addListener("prettyprintchange", this._onPrettyPrintChange); }, diff --git a/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js b/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js index ffc43186f164..f28f42ebc464 100644 --- a/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js +++ b/browser/devtools/debugger/test/browser_dbg_chrome-debugging.js @@ -45,12 +45,12 @@ function test() { function testChromeActor() { gClient.getProcess().then(aResponse => { gClient.addListener("newGlobal", onNewGlobal); - gClient.addListener("newSource", onNewSource); let actor = aResponse.form.actor; gClient.attachTab(actor, (response, tabClient) => { tabClient.attachThread(null, (aResponse, aThreadClient) => { gThreadClient = aThreadClient; + gThreadClient.addListener("newSource", onNewSource); if (aResponse.error) { ok(false, "Couldn't attach to the chrome debugger."); @@ -78,7 +78,7 @@ function onNewSource(aEvent, aPacket) { if (aPacket.source.url.startsWith("chrome:")) { ok(true, "Received a new chrome source: " + aPacket.source.url); - gClient.removeListener("newSource", onNewSource); + gThreadClient.removeListener("newSource", onNewSource); gNewChromeSource.resolve(); } } diff --git a/toolkit/devtools/client/dbg-client.jsm b/toolkit/devtools/client/dbg-client.jsm index 53830050ffba..dfc08d642ee3 100644 --- a/toolkit/devtools/client/dbg-client.jsm +++ b/toolkit/devtools/client/dbg-client.jsm @@ -224,7 +224,6 @@ const UnsolicitedNotifications = { "networkEventUpdate": "networkEventUpdate", "newGlobal": "newGlobal", "newScript": "newScript", - "newSource": "newSource", "tabDetached": "tabDetached", "tabListChanged": "tabListChanged", "reflowActivity": "reflowActivity", @@ -1623,7 +1622,6 @@ function ThreadClient(aClient, aActor) { this._pauseGrips = {}; this._threadGrips = {}; this.request = this.client.request; - this.events = []; } ThreadClient.prototype = { @@ -2170,7 +2168,9 @@ ThreadClient.prototype = { actors: args(0) }, { telemetry: "PROTOTYPESANDPROPERTIES" - }) + }), + + events: ["newSource"] }; eventSource(ThreadClient.prototype); diff --git a/toolkit/devtools/server/tests/unit/head_dbg.js b/toolkit/devtools/server/tests/unit/head_dbg.js index 6a72303a19f5..1fe7bf2c23c2 100644 --- a/toolkit/devtools/server/tests/unit/head_dbg.js +++ b/toolkit/devtools/server/tests/unit/head_dbg.js @@ -75,9 +75,9 @@ function attachTab(client, tab) { return rdpRequest(client, client.attachTab, tab.actor); } -function waitForNewSource(client, url) { +function waitForNewSource(threadClient, url) { dump("Waiting for new source with url '" + url + "'.\n"); - return waitForEvent(client, "newSource", function (packet) { + return waitForEvent(threadClient, "newSource", function (packet) { return packet.source.url === url; }); } diff --git a/toolkit/devtools/server/tests/unit/test_get-executable-lines-source-map.js b/toolkit/devtools/server/tests/unit/test_get-executable-lines-source-map.js index a92dadcca80e..78be1fab63c6 100644 --- a/toolkit/devtools/server/tests/unit/test_get-executable-lines-source-map.js +++ b/toolkit/devtools/server/tests/unit/test_get-executable-lines-source-map.js @@ -31,7 +31,7 @@ function run_test() { } function test_executable_lines() { - gClient.addOneTimeListener("newSource", function _onNewSource(evt, packet) { + gThreadClient.addOneTimeListener("newSource", function _onNewSource(evt, packet) { do_check_eq(evt, "newSource"); gThreadClient.getSources(function ({error, sources}) { diff --git a/toolkit/devtools/server/tests/unit/test_get-executable-lines.js b/toolkit/devtools/server/tests/unit/test_get-executable-lines.js index 6c746958de13..e03275993f9d 100644 --- a/toolkit/devtools/server/tests/unit/test_get-executable-lines.js +++ b/toolkit/devtools/server/tests/unit/test_get-executable-lines.js @@ -31,7 +31,7 @@ function run_test() { } function test_executable_lines() { - gClient.addOneTimeListener("newSource", function _onNewSource(evt, packet) { + gThreadClient.addOneTimeListener("newSource", function _onNewSource(evt, packet) { do_check_eq(evt, "newSource"); gThreadClient.getSources(function ({error, sources}) { @@ -52,4 +52,4 @@ function test_executable_lines() { function arrays_equal(a,b) { return !(a 0) { return; } - gClient.removeListener("newSource", _onNewSource); + gThreadClient.removeListener("newSource", _onNewSource); testBreakpointMapping("a", function () { testBreakpointMapping("b", function () { diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js index eda2d7d2ce7c..39ef8a579f17 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-04.js @@ -27,7 +27,7 @@ function run_test() function test_absolute_source_map() { - gClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) { + gThreadClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) { do_check_eq(aEvent, "newSource"); do_check_eq(aPacket.type, "newSource"); do_check_true(!!aPacket.source); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js index 856a0354f030..19d1e42ab720 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-05.js @@ -27,7 +27,7 @@ function run_test() function test_relative_source_map() { - gClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) { + gThreadClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) { do_check_eq(aEvent, "newSource"); do_check_eq(aPacket.type, "newSource"); do_check_true(!!aPacket.source); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js index 5b7e9dcd4ae3..561837de6f62 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-06.js @@ -30,11 +30,11 @@ function test_source_content() { let numNewSources = 0; - gClient.addListener("newSource", function _onNewSource(aEvent, aPacket) { + gThreadClient.addListener("newSource", function _onNewSource(aEvent, aPacket) { if (++numNewSources !== 3) { return; } - gClient.removeListener("newSource", _onNewSource); + gThreadClient.removeListener("newSource", _onNewSource); gThreadClient.getSources(function (aResponse) { do_check_true(!aResponse.error, "Should not get an error"); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js index ef6d10ff6000..28deb693051b 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-07.js @@ -29,7 +29,7 @@ function test_cached_original_sources() { writeFile("temp.js", "initial content"); - gClient.addOneTimeListener("newSource", onNewSource); + gThreadClient.addOneTimeListener("newSource", onNewSource); let node = new SourceNode(1, 0, getFileUrl("temp.js"), diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js index a56a824762cd..1b32c33fdc9d 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-08.js @@ -28,7 +28,7 @@ function run_test() function test_source_maps() { - gClient.addOneTimeListener("newSource", function (aEvent, aPacket) { + gThreadClient.addOneTimeListener("newSource", function (aEvent, aPacket) { let sourceClient = gThreadClient.source(aPacket.source); sourceClient.source(function ({error, source}) { do_check_true(!error, "should be able to grab the source"); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js index e5d13c9c6ac7..0957928b185c 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-09.js @@ -29,7 +29,7 @@ function test_minified() { let newSourceFired = false; - gClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) { + gThreadClient.addOneTimeListener("newSource", function _onNewSource(aEvent, aPacket) { do_check_eq(aEvent, "newSource"); do_check_eq(aPacket.type, "newSource"); do_check_true(!!aPacket.source); diff --git a/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js b/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js index 4593dda99b28..353ffec56bce 100644 --- a/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js +++ b/toolkit/devtools/server/tests/unit/test_sourcemaps-13.js @@ -77,7 +77,7 @@ function setup_new_code() { code += "\n//# sourceMappingURL=" + getFileUrl(MAP_FILE_NAME, true); writeFile(MAP_FILE_NAME, map.toString()); - gClient.addOneTimeListener("newSource", test_new_sources); + gThreadClient.addOneTimeListener("newSource", test_new_sources); Cu.evalInSandbox(code, gDebuggee, "1.8", From 03247b4e7179ce905ae7a234f2548e074e71d29c Mon Sep 17 00:00:00 2001 From: Martyn Haigh Date: Tue, 23 Jun 2015 10:37:45 -0700 Subject: [PATCH 05/39] Bug 1176883 - Fix privateBrowing translation issue (r=flod) --HG-- extra : amend_source : d495dbfd681fa2a324052deddb4fab9ba66d3dc3 --- mobile/android/chrome/content/aboutPrivateBrowsing.xhtml | 2 +- mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mobile/android/chrome/content/aboutPrivateBrowsing.xhtml b/mobile/android/chrome/content/aboutPrivateBrowsing.xhtml index 30eda1694254..895736f25969 100644 --- a/mobile/android/chrome/content/aboutPrivateBrowsing.xhtml +++ b/mobile/android/chrome/content/aboutPrivateBrowsing.xhtml @@ -31,7 +31,7 @@

&privatebrowsingpage.title.normal;

-

&privatebrowsingpage.description.private;

+

&privatebrowsingpage.description.private2;

&privatebrowsingpage.description.normal;

&privatebrowsingpage.link.private;

diff --git a/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd b/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd index 2264c1010ab4..4a278f41e49c 100644 --- a/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd +++ b/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd @@ -10,7 +10,7 @@ - + From 2c907a42d37e49ab2e0f8c344629fe56bf77eb21 Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Tue, 16 Jun 2015 20:25:42 -0700 Subject: [PATCH 06/39] Bug 1175388 - Disable AlwaysShowAction on a file level. r=margaret We have a custom menu system here and interpret these attributes ourselves so this warning isn't relevant to us. --HG-- extra : commitid : 9iDtQH2P86 extra : rebase_source : 1f2e5c37e57057cd92971a3ff637837032f78516 --- .../base/resources/menu-large-v11/browser_app_menu.xml | 6 +++++- mobile/android/base/resources/menu-v11/browser_app_menu.xml | 6 +++++- .../base/resources/menu-xlarge-v11/browser_app_menu.xml | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml index cbe64bead24d..1d6e78283845 100644 --- a/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml +++ b/mobile/android/base/resources/menu-large-v11/browser_app_menu.xml @@ -3,7 +3,11 @@ - 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/. --> - + + - + + - + + Date: Sat, 20 Jun 2015 23:50:24 -0700 Subject: [PATCH 07/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/52adc2c2cd0a Author: Timothy Guan-tin Chien Desc: Merge pull request #30604 from timdream/keyboard-update-height Bug 1174991 - Don't wait for animation frame before update the height, r=rudyl, janjongboom ======== https://hg.mozilla.org/integration/gaia-central/rev/4447541b482d Author: Timothy Guan-tin Chien Desc: Bug 1174991 - Don't wait for animation frame before update the height --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b5c104d07567..be67c701c3d9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "311c4e59936a407e64509f54fecb440d8a78e3c8", + "git_revision": "7683f59196bdd0e8d4e6524e14c6aee329698f14", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7e585532a2935425fcddb964cb9002b18b94b3ff", + "revision": "52adc2c2cd0acb028a52c92dddfc9b134feaac3f", "repo_path": "integration/gaia-central" } From 206b23f296c6b0e9f8972b269f60fb6ced3a6efa Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sat, 20 Jun 2015 23:52:20 -0700 Subject: [PATCH 08/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index ba61afa9d9eb..2589f22b1a5d 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 192ec17fba02..f26a435911dc 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 0b97e0b0d523..2ae58edca885 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 9d7c115e22bb..4f3bbc53b72a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index b2565e8afeea..992d51c1b9d8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index c16432e0e976..9fb7326b645a 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 0b97e0b0d523..2ae58edca885 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 5451ffc11642..fb4e927ef64c 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 1603baea4575..5b555a061965 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a2cde0a9e94e..a54645a0a208 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b5ab3ec7c612e32f879e177f23ab8dde182690c3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 21 Jun 2015 05:40:30 -0700 Subject: [PATCH 09/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/6bcd788fd4ac Author: Martijn Desc: Merge pull request #30675 from mwargers/1162112_enable Bug 1162112 - re-enable test_rocketbar_add_collection_save_bookmark.p… ======== https://hg.mozilla.org/integration/gaia-central/rev/5fb8043d5aba Author: Martijn Wargers Desc: Bug 1162112 - re-enable test_rocketbar_add_collection_save_bookmark.py in the manifest, because it works again --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index be67c701c3d9..a84bc38cfefb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "7683f59196bdd0e8d4e6524e14c6aee329698f14", + "git_revision": "77dd6b90d52f94853f11101d574107b873fa01b3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "52adc2c2cd0acb028a52c92dddfc9b134feaac3f", + "revision": "6bcd788fd4aca4ece9a8cb548c21ef1e30c08669", "repo_path": "integration/gaia-central" } From fe380d754afeeaaa3f64bbb9cb61b325e6cd0409 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 21 Jun 2015 05:42:53 -0700 Subject: [PATCH 10/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 2589f22b1a5d..cb5562a265f0 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index f26a435911dc..17f89bd0d018 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2ae58edca885..7b24e4d40021 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 4f3bbc53b72a..a753ced1d7fd 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 992d51c1b9d8..63c70f90eb16 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 9fb7326b645a..12abd867c67c 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2ae58edca885..7b24e4d40021 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index fb4e927ef64c..0b9ea3c22676 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 5b555a061965..e563d43561a3 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a54645a0a208..a2fe731a634a 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 3dfa7e395958688c7be1734fe87fd94a45e523f7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 21 Jun 2015 06:00:23 -0700 Subject: [PATCH 11/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/147a3173e785 Author: Martijn Desc: Merge pull request #30520 from mwargers/1172460_2 Bug 1172460 - Intermittent failure in test_sms_notification_removed_when_sms_deleted.py in wait_for_notification_toaster_displayed ======== https://hg.mozilla.org/integration/gaia-central/rev/71781e51ccdd Author: Martijn Wargers Desc: Bug 1172460 - Intermittent failure in test_sms_notification_removed_when_sms_deleted.py in wait_for_notification_toaster_displayed --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a84bc38cfefb..a9453ab70ae7 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "77dd6b90d52f94853f11101d574107b873fa01b3", + "git_revision": "a20a86755274d942b62e92b34452fa6d58d30819", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6bcd788fd4aca4ece9a8cb548c21ef1e30c08669", + "revision": "147a3173e785041252a54594759e6733a65a810c", "repo_path": "integration/gaia-central" } From 8706e3df108abb3f68bf4b247dcb6d1673bdc696 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 21 Jun 2015 06:02:18 -0700 Subject: [PATCH 12/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index cb5562a265f0..03348b9744b0 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 17f89bd0d018..3ffb97e8c6e8 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 7b24e4d40021..952b860994d9 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a753ced1d7fd..2b17940e623f 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 63c70f90eb16..d36f56654608 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 12abd867c67c..b8324614cf6f 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 7b24e4d40021..952b860994d9 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 0b9ea3c22676..6d06402b00db 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e563d43561a3..4929a66e1d18 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a2fe731a634a..691867f7c4b6 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 757d7e3da6f64b46a7a918b23cfe3fdc4763794d Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 21 Jun 2015 22:40:33 -0700 Subject: [PATCH 13/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/45005c5a854b Author: Kevin Grandon Desc: Merge pull request #30620 from KevinGrandon/bug_1175360_settings_navigation_gaia_switch Bug 1175360 - [Settings] Convert navigation switch to use gaia-switch ======== https://hg.mozilla.org/integration/gaia-central/rev/471b451118ff Author: Kevin Grandon Desc: Bug 1175360 - [Settings] Convert navigation switch to use gaia-switch --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a9453ab70ae7..4c4e114c5022 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "a20a86755274d942b62e92b34452fa6d58d30819", + "git_revision": "900d01e1d56193c01f27cea45122f88eb8f261b7", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "147a3173e785041252a54594759e6733a65a810c", + "revision": "45005c5a854b3dfa6cba2451592b1a57cca920c6", "repo_path": "integration/gaia-central" } From a5412f979fe93b7d3313f540ab3796c10f23f736 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Sun, 21 Jun 2015 22:42:54 -0700 Subject: [PATCH 14/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 03348b9744b0..e5506ab6dcc7 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 3ffb97e8c6e8..140fdbafeedc 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 952b860994d9..c4f1fd620673 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 2b17940e623f..6ec6f3cb5b8d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index d36f56654608..8a127fc58fbb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index b8324614cf6f..d29a0bb43d69 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 952b860994d9..c4f1fd620673 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 6d06402b00db..715ce00344be 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 4929a66e1d18..553da8d6dcb0 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 691867f7c4b6..6a3b74d0d4c8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From f0e8f45c2117e4db8d17188e5097683cb523fe86 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 03:25:11 -0700 Subject: [PATCH 15/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fb9444ff2624 Author: Arthur Chen Desc: Merge pull request #30562 from crh0716/1173522 Bug 1173522 - Tie the factory reset toggle to the warning dialogs r=eragonj ======== https://hg.mozilla.org/integration/gaia-central/rev/62907fb0ddf7 Author: Arthur Chen Desc: Bug 1173522 - Tie the factory reset toggle to the warning dialogs --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4c4e114c5022..8d6d304d25a4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "900d01e1d56193c01f27cea45122f88eb8f261b7", + "git_revision": "c65396dbaee27addf7efce94315951585bb13bf3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "45005c5a854b3dfa6cba2451592b1a57cca920c6", + "revision": "fb9444ff2624320d8d610cf32685fdaa93ad2ee1", "repo_path": "integration/gaia-central" } From 0286e2c900dc3c5702471ecfd1f5fabe5bf74ea6 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 03:27:07 -0700 Subject: [PATCH 16/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index e5506ab6dcc7..b34a1a8f5845 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 140fdbafeedc..0f131d65be4f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c4f1fd620673..baba4ae5b7fb 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 6ec6f3cb5b8d..49ab0723ff9e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 8a127fc58fbb..f4b9a8c16f96 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index d29a0bb43d69..a55e210e55b9 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c4f1fd620673..baba4ae5b7fb 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 715ce00344be..43eee288c3c3 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 553da8d6dcb0..17f489ecc2db 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 6a3b74d0d4c8..01a00362dcfa 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 502724ed8a03c5242aeda0ea18cc22ecdf572dff Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 05:05:24 -0700 Subject: [PATCH 17/39] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/2f204997a498 Author: BavarianTomcat Desc: Revert "Bug 1174991 - Don't wait for animation frame before update the height" for Gij(8) test failures This reverts commit 8d50d3d35d2a64c7c095206a5df0afa8ecc367bd. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8d6d304d25a4..c80280dae13b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c65396dbaee27addf7efce94315951585bb13bf3", + "git_revision": "777843817e8235dddb415a18516584011ed2241b", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "fb9444ff2624320d8d610cf32685fdaa93ad2ee1", + "revision": "2f204997a4982b25b257d622cd3707cf8455e0c3", "repo_path": "integration/gaia-central" } From ea895163fb9dda0fde92c3faea5bb47ed768df77 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 05:07:20 -0700 Subject: [PATCH 18/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index b34a1a8f5845..fc66eb259fb3 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0f131d65be4f..71ca316d15fb 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index baba4ae5b7fb..4e123dc2ee8c 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 49ab0723ff9e..77cab4bf31f5 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f4b9a8c16f96..03d65041ada6 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index a55e210e55b9..25496c8842d0 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index baba4ae5b7fb..4e123dc2ee8c 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 43eee288c3c3..5cfbffe1ab33 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 17f489ecc2db..eb6310185c6d 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 01a00362dcfa..5a4754f2d18c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 56d64885a68cb3bdd23c9c820b5a3dea20bea5bb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 06:15:20 -0700 Subject: [PATCH 19/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/bb241ae4e33a Author: Gabriele Svelto Desc: Merge pull request #30682 from gabrielesvelto/bug-1176193-dialer-eslint-cleanup Bug 1176193 - Make the dialer, callscreen and emergency-call apps eslint-clean r=kgrandon ======== https://hg.mozilla.org/integration/gaia-central/rev/d0d3790fce8b Author: Gabriele Svelto Desc: Bug 1176193 - Make the dialer, callscreen and emergency-call apps eslint-clean r=kgrandon --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c80280dae13b..ef643d5c6b8b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "777843817e8235dddb415a18516584011ed2241b", + "git_revision": "f8a1a15d8e98b0316e8e89682bab9460838fdeed", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "2f204997a4982b25b257d622cd3707cf8455e0c3", + "revision": "bb241ae4e33ade6338e0ce84dacaf26235177959", "repo_path": "integration/gaia-central" } From 45efc644a16174b0113363b789e2c1cb4e8b06b0 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 06:17:16 -0700 Subject: [PATCH 20/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index fc66eb259fb3..02de0da12456 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 71ca316d15fb..ca3c3daa2e4f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 4e123dc2ee8c..b2b46b84b7fd 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 77cab4bf31f5..1e9793a7d577 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 03d65041ada6..5b83acc00f86 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 25496c8842d0..251b14c24d41 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 4e123dc2ee8c..b2b46b84b7fd 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 5cfbffe1ab33..759e1d0dcda1 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index eb6310185c6d..2f49a7606f9e 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 5a4754f2d18c..ef75d9486e5c 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From b1bd9e28afec2bb73a03942b82be632384ca6751 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 08:03:17 -0700 Subject: [PATCH 21/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 02de0da12456..1bddeedd8128 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ca3c3daa2e4f..531e67f8f788 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 1e9793a7d577..fb732e30551a 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5b83acc00f86..aeeec12201a4 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 251b14c24d41..c2bf4814a2a5 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 759e1d0dcda1..82d4aae96023 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -23,7 +23,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 2f49a7606f9e..582ad47850ef 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -20,7 +20,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index ef75d9486e5c..66bb4ac55d14 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -23,7 +23,7 @@ - + From 18c1941c570beacad46bd73d87f2b6121ede720c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 08:15:14 -0700 Subject: [PATCH 22/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/86988321a865 Author: gasolin Desc: Merge pull request #30589 from gasolin/issue-1173675-system Bug 1173675 - link gaia jsdoc gh-page on system readme, r=alive ======== https://hg.mozilla.org/integration/gaia-central/rev/2017cb9f7b33 Author: gasolin Desc: Bug 1173675 - link gaia jsdoc gh-page on system readme, r=alive --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ef643d5c6b8b..45340578732a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "f8a1a15d8e98b0316e8e89682bab9460838fdeed", + "git_revision": "720e38c5140272ea38fcedc142b4395e443632c7", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "bb241ae4e33ade6338e0ce84dacaf26235177959", + "revision": "86988321a865a0ce7668da478ebfce8fdc9b01e0", "repo_path": "integration/gaia-central" } From 4cecfc273e81e24daf9bb969024ba2eb9dc57e0f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 08:17:11 -0700 Subject: [PATCH 23/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 1bddeedd8128..b31a3ccecf06 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 531e67f8f788..ba9ccceabae3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b2b46b84b7fd..6c3375398ad6 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index fb732e30551a..cf5316d28454 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index aeeec12201a4..69e4b84f1c5d 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index c2bf4814a2a5..7f928756c93b 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b2b46b84b7fd..6c3375398ad6 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 82d4aae96023..a8974a784d69 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 582ad47850ef..5506d09826b9 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 66bb4ac55d14..41b48b6346bd 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From ea9bce88dfa967f9c585ce66219f7e17498e4e0b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 11:20:10 -0700 Subject: [PATCH 24/39] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/b62b937817ca Author: Doug Sherk Desc: Revert "Merge pull request #30623 from mozfreddyb/passcode-helper-final-bug-1123325" This reverts commit 35c33cca1934211674f16d923f46be3ca7f4bd31, reversing changes made to 64291c716e7278e05834ff384d804d70ad691e8a. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 45340578732a..3c48649d015b 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "720e38c5140272ea38fcedc142b4395e443632c7", + "git_revision": "c46c77ad85ab0a62d95f1488adc4bd10ad13fa73", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "86988321a865a0ce7668da478ebfce8fdc9b01e0", + "revision": "b62b937817cae16c5017b3a9b6380572316a138e", "repo_path": "integration/gaia-central" } From aad84b9ae4a1082be953ddba23da0ea9125e8484 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 11:22:07 -0700 Subject: [PATCH 25/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index b31a3ccecf06..e8b0c9a1252b 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ba9ccceabae3..3920457c2457 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6c3375398ad6..d1902d5d75a5 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index cf5316d28454..3173d4cebb39 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 69e4b84f1c5d..a2cb5cafaa9c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 7f928756c93b..bd5d21a7ba4b 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 6c3375398ad6..d1902d5d75a5 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index a8974a784d69..cc053919a568 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 5506d09826b9..51c0482f6ff4 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 41b48b6346bd..38bb8c679da7 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From bb6e16c3396f8beff0ff9d551543487253027eb1 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 15:50:13 -0700 Subject: [PATCH 26/39] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/f508a601ed8d Author: Sam Foster Desc: Merge pull request #30680 from sfoster/scrollsnap-cardview-bug-1161229 Bug 1161229 - Use CSS Scroll Snapping in card view. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/c06ed442d342 Author: Sam Foster Desc: Improved changed card container role from group to presentation (yzen) ======== https://hg.mozilla.org/integration/gaia-central/rev/32ea90226914 Author: Sam Foster Desc: Remove scrollbar clipping, remove over-width for single card ======== https://hg.mozilla.org/integration/gaia-central/rev/4fdaa8d29458 Author: Sam Foster Desc: Bug 1161229 - Use CSS Scroll Snapping in card view * Add CSS scroll-snapping to card view (etienne, jetvillegas) https://github.com/jetvillegas/gaia/tree/APZC-card-view * Restore support for vertical swiping to kill apps. * Unknown scroll-snap properties added to csslint's xfail list * Move width/height/margin card props to CSS * Move cross-slide via translateY to Card * Maintain _stackIndex as default pointer into stack to return to * Slide to fill gap from right, fix initial/return-to position * Re-enable wheel event handling, update a11y attributes on each wheel DOM_D * Update Card and TaskManager unit tests * Update wait_for_card_ready in python CardView class ======== https://hg.mozilla.org/integration/gaia-central/rev/9ba37446250b Author: Sam Foster Desc: Merge pull request #30679 from sfoster/ftu-holdcamera-bug-1176030 Bug 1176030 - Ignore holdcamera while FTU is running. r=etienne ======== https://hg.mozilla.org/integration/gaia-central/rev/b59b0294546e Author: Sam Foster Desc: Bug 1176030 - Ignore holdcamera while FTU is running. r=etienne --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 3c48649d015b..11944b094445 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c46c77ad85ab0a62d95f1488adc4bd10ad13fa73", + "git_revision": "9d267dd8dc3cf86c1c0536defc76d16ef1512fd3", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "b62b937817cae16c5017b3a9b6380572316a138e", + "revision": "f508a601ed8d22a054e8fe655545cca2d687b66c", "repo_path": "integration/gaia-central" } From 145ce5cd4c9d3af0a8ba27c2538fa63a0ff0485f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 15:52:11 -0700 Subject: [PATCH 27/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index e8b0c9a1252b..7253b56e9f32 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 3920457c2457..ff4e9cd3a8e4 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index d1902d5d75a5..003db7cdfd65 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 3173d4cebb39..e790212b90bc 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index a2cb5cafaa9c..0f970260430b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index bd5d21a7ba4b..866c7698f3d7 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index d1902d5d75a5..003db7cdfd65 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index cc053919a568..25a3e83e8f44 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 51c0482f6ff4..11f22a96df81 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 38bb8c679da7..d8244e0dd3fd 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 9545e84017227ee65a0f5b80c3fb6e219fc7d782 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 17:00:27 -0700 Subject: [PATCH 28/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/cbef5af4c81b Author: Guillaume C. Marty Desc: Merge pull request #30595 from gmarty/Bug-1085651-Incorrect-time-and-status-showed-in-the-statusbar Bug 1085651 - Incorrect time (clock) and status showed in the statusbar ======== https://hg.mozilla.org/integration/gaia-central/rev/088e80da4029 Author: Guillaume Marty Desc: Bug 1085651 - Incorrect time (clock) and status showed in the statusbar --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 11944b094445..d2a584b05589 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "9d267dd8dc3cf86c1c0536defc76d16ef1512fd3", + "git_revision": "c4d3b8fd78bcd7eff1b127060ec6490a891b7a35", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "f508a601ed8d22a054e8fe655545cca2d687b66c", + "revision": "cbef5af4c81b5cbdd753dacf30aeba887261f116", "repo_path": "integration/gaia-central" } From f7ddba3e6eeb2869bf4e7ef6db5b9257d6a34eef Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 22 Jun 2015 17:02:23 -0700 Subject: [PATCH 29/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 7253b56e9f32..4d1300b1132e 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ff4e9cd3a8e4..03a3da3c0b64 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 003db7cdfd65..2b93b8a97f11 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index e790212b90bc..a92b41d091f6 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 0f970260430b..0d9b1c47380f 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 866c7698f3d7..ef727c5a4525 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 003db7cdfd65..2b93b8a97f11 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 25a3e83e8f44..8f7a99d92694 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 11f22a96df81..d4b5eba60ed7 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index d8244e0dd3fd..8b8cfaf71b37 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 0d46880e7368c0f178e24e14d4ad44bb6c8821e7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 01:10:30 -0700 Subject: [PATCH 30/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/fe6138d502ff Author: Carsten Book Desc: Merge pull request #30670 from aosmond/bug1176191 Bug 1176191 - Release camera if battery is too low instead of disabling controls. r=jdarcangelo ======== https://hg.mozilla.org/integration/gaia-central/rev/be14346d1b0d Author: Andrew Osmond Desc: Bug 1176191 - Release camera if battery is too low instead of disabling controls. --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index d2a584b05589..a32d0a30e385 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "c4d3b8fd78bcd7eff1b127060ec6490a891b7a35", + "git_revision": "3485a10d6e630b4aff42ddae51c08f052ad3d6ae", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "cbef5af4c81b5cbdd753dacf30aeba887261f116", + "revision": "fe6138d502fffd33df1377e3f046c54e9f6f2afd", "repo_path": "integration/gaia-central" } From d9b6a966a30b3e28522e669c5672d2e74d5e29eb Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 01:12:50 -0700 Subject: [PATCH 31/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 4d1300b1132e..550b3e6ed495 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 03a3da3c0b64..0cdea6e6842a 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2b93b8a97f11..c23805487b62 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index a92b41d091f6..b772377be0e3 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 0d9b1c47380f..732ffea2fa43 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index ef727c5a4525..82f2c741acc5 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2b93b8a97f11..c23805487b62 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 8f7a99d92694..3e0e7a007e08 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index d4b5eba60ed7..f56d8183b151 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 8b8cfaf71b37..a14748dd3c1f 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 6d3473f57ab1e9535518cf21aba6e88213839823 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 13:40:32 -0700 Subject: [PATCH 32/39] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a39ba3017833 Author: albertopq Desc: Merge pull request #30646 from albertopq/1171883-signal-searching2 Bug 1171883 - [Statusbar] Signal icon is not animated while searching r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/8a728c02c594 Author: Guillaume Marty Desc: Bug 1171883 - [Statusbar] Signal icon is not animated while searching ======== https://hg.mozilla.org/integration/gaia-central/rev/f04647213cda Author: gasolin Desc: Merge pull request #30587 from gasolin/issue-1173675-clock Bug 1173675 - link gaia jsdoc gh-page on per app readme, r=mcavanaugh, rudy, steve ======== https://hg.mozilla.org/integration/gaia-central/rev/64cca92fcb45 Author: gasolin Desc: Bug 1173675 - link gaia jsdoc gh-page on per app readme, r=mcavanaugh, rudy, steve --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a32d0a30e385..4da7df27a845 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "3485a10d6e630b4aff42ddae51c08f052ad3d6ae", + "git_revision": "4d7da51b3923a0f54748c6619919e59c91058bb5", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "fe6138d502fffd33df1377e3f046c54e9f6f2afd", + "revision": "a39ba3017833f1be20826bdbf2abef2f420a570e", "repo_path": "integration/gaia-central" } From a35f947cf9bd2ba4ef5a4f00dc12285b65694f6f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 13:42:54 -0700 Subject: [PATCH 33/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 550b3e6ed495..54dc6fe44c9f 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 0cdea6e6842a..3a9015057967 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index c23805487b62..47113a994cb3 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index b772377be0e3..b4bba5668e4e 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 732ffea2fa43..bd2fb37d6c92 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 82f2c741acc5..00426e9e0b34 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index c23805487b62..47113a994cb3 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 3e0e7a007e08..231d86fb59cf 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index f56d8183b151..0c5d3a5fbc8b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index a14748dd3c1f..acdb0db59ebc 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From e998928563e4a3f37ec40eeeb9e27efc35d9b505 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 17:23:27 -0700 Subject: [PATCH 34/39] Bumping manifests a=b2g-bump --- b2g/config/dolphin/sources.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 3a9015057967..9f9ec8a60016 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -38,7 +38,7 @@ - + From c58349faa4ad19ac3456897d8c92b3bce795d462 Mon Sep 17 00:00:00 2001 From: Drew Willcoxon Date: Tue, 23 Jun 2015 17:42:19 -0700 Subject: [PATCH 35/39] Bug 1176381 - Fix a typo in SearchSuggestionController that causes a JS warning. r=MattN --- toolkit/components/search/SearchSuggestionController.jsm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/components/search/SearchSuggestionController.jsm b/toolkit/components/search/SearchSuggestionController.jsm index 8109fbb35849..d64f5e0b4248 100644 --- a/toolkit/components/search/SearchSuggestionController.jsm +++ b/toolkit/components/search/SearchSuggestionController.jsm @@ -128,7 +128,7 @@ this.SearchSuggestionController.prototype = { if (!this.maxLocalResults && !this.maxRemoteResults) { throw new Error("Zero results expected, what are you trying to do?"); } - if (this.maxLocalResults < 0 || this.remoteResult < 0) { + if (this.maxLocalResults < 0 || this.maxRemoteResults < 0) { throw new Error("Number of requested results must be positive"); } From ad3697cd009b04b3afe2c67efe453d78ebb03df4 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 19:00:24 -0700 Subject: [PATCH 36/39] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/28b5133c0a06 Author: Gabriele Svelto Desc: Merge pull request #30536 from alivedise/bugzilla/1102675/send-activity-window-opener-to-background Bug 1144132 - Activity opener visibility state r=etienne,schung ======== https://hg.mozilla.org/integration/gaia-central/rev/24934d62599e Author: Alive Kuo Desc: Bug 1144132 - Activity opener visibility state --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 4da7df27a845..36ea209f260e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "4d7da51b3923a0f54748c6619919e59c91058bb5", + "git_revision": "eb0d4aefa62b20420d6fa0642515a110daca5d97", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "a39ba3017833f1be20826bdbf2abef2f420a570e", + "revision": "28b5133c0a062776dac8282abcc7810dc317a0bc", "repo_path": "integration/gaia-central" } From 4df42a1a488de4b67ff8b5285b48754a38399114 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Tue, 23 Jun 2015 19:02:21 -0700 Subject: [PATCH 37/39] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 54dc6fe44c9f..ce53479ac134 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 9f9ec8a60016..e949664c07b8 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 47113a994cb3..271a65f34c89 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index b4bba5668e4e..a58fd83a1c68 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index bd2fb37d6c92..b66efd5c0ccc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 00426e9e0b34..4e6fda47dc46 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 47113a994cb3..271a65f34c89 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 231d86fb59cf..cee22ec3bb95 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 0c5d3a5fbc8b..b6dfa7c0e209 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index acdb0db59ebc..47cce9d873ae 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7fc3405211f7c0017cfb381140faa8c3dc6f767b Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Tue, 23 Jun 2015 23:11:48 -0700 Subject: [PATCH 38/39] Bug 1176778 - Enable jsx-sort-props eslint rule for Loop. rs=dmose --- browser/components/loop/.eslintrc | 2 +- .../components/loop/content/js/contacts.js | 48 +- .../components/loop/content/js/contacts.jsx | 48 +- .../loop/content/js/conversation.js | 9 +- .../loop/content/js/conversation.jsx | 9 +- .../loop/content/js/conversationViews.js | 38 +- .../loop/content/js/conversationViews.jsx | 36 +- browser/components/loop/content/js/panel.js | 141 ++--- browser/components/loop/content/js/panel.jsx | 141 ++--- .../components/loop/content/js/roomViews.js | 37 +- .../components/loop/content/js/roomViews.jsx | 37 +- .../loop/content/shared/js/feedbackViews.js | 44 +- .../loop/content/shared/js/feedbackViews.jsx | 44 +- .../loop/content/shared/js/textChatView.js | 20 +- .../loop/content/shared/js/textChatView.jsx | 20 +- .../loop/content/shared/js/views.js | 50 +- .../loop/content/shared/js/views.jsx | 50 +- .../standalone/content/js/fxOSMarketplace.js | 2 +- .../standalone/content/js/fxOSMarketplace.jsx | 2 +- .../content/js/standaloneRoomViews.js | 31 +- .../content/js/standaloneRoomViews.jsx | 29 +- .../loop/standalone/content/js/webapp.js | 72 ++- .../loop/standalone/content/js/webapp.jsx | 70 +-- browser/components/loop/ui/ui-showcase.js | 515 ++++++++++-------- browser/components/loop/ui/ui-showcase.jsx | 515 ++++++++++-------- 25 files changed, 1098 insertions(+), 912 deletions(-) diff --git a/browser/components/loop/.eslintrc b/browser/components/loop/.eslintrc index 787327664c4e..a9140185ae40 100644 --- a/browser/components/loop/.eslintrc +++ b/browser/components/loop/.eslintrc @@ -63,7 +63,7 @@ "react/jsx-quotes": [2, "double", "avoid-escape"], "react/jsx-no-undef": 2, // Need to fix instances where this is failing. - "react/jsx-sort-props": 0, + "react/jsx-sort-props": 2, "react/jsx-sort-prop-types": 0, "react/jsx-uses-vars": 2, // Need to fix the couple of instances which don't diff --git a/browser/components/loop/content/js/contacts.js b/browser/components/loop/content/js/contacts.js index d57d7f7f0c47..3cd97dedf5a6 100644 --- a/browser/components/loop/content/js/contacts.js +++ b/browser/components/loop/content/js/contacts.js @@ -135,8 +135,8 @@ loop.contacts = (function(_, mozL10n) { React.createElement(ButtonGroup, null, React.createElement(Button, {caption: mozL10n.get("gravatars_promo_button_nothanks"), onClick: this.handleCloseButtonClick}), - React.createElement(Button, {caption: mozL10n.get("gravatars_promo_button_use"), - additionalClass: "button-accept", + React.createElement(Button, {additionalClass: "button-accept", + caption: mozL10n.get("gravatars_promo_button_use"), onClick: this.handleUseButtonClick}) ) ) @@ -191,31 +191,35 @@ loop.contacts = (function(_, mozL10n) { "dropdown-menu-up": this.state.openDirUp })}, React.createElement("li", {className: cx({ "dropdown-menu-item": true, "disabled": this.props.blocked }), - onClick: this.onItemClick, - "data-action": "video-call"}, + "data-action": "video-call", + onClick: this.onItemClick}, React.createElement("i", {className: "icon icon-video-call"}), mozL10n.get("video_call_menu_button") ), React.createElement("li", {className: cx({ "dropdown-menu-item": true, "disabled": this.props.blocked }), - onClick: this.onItemClick, "data-action": "audio-call"}, + "data-action": "audio-call", + onClick: this.onItemClick}, React.createElement("i", {className: "icon icon-audio-call"}), mozL10n.get("audio_call_menu_button") ), React.createElement("li", {className: cx({ "dropdown-menu-item": true, "disabled": !this.props.canEdit }), - onClick: this.onItemClick, "data-action": "edit"}, + "data-action": "edit", + onClick: this.onItemClick}, React.createElement("i", {className: "icon icon-edit"}), mozL10n.get("edit_contact_menu_button") ), React.createElement("li", {className: "dropdown-menu-item", - onClick: this.onItemClick, "data-action": blockAction}, + "data-action": blockAction, + onClick: this.onItemClick}, React.createElement("i", {className: "icon icon-" + blockAction}), mozL10n.get(blockLabel) ), React.createElement("li", {className: cx({ "dropdown-menu-item": true, "disabled": !this.props.canEdit }), - onClick: this.onItemClick, "data-action": "remove"}, + "data-action": "remove", + onClick: this.onItemClick}, React.createElement("i", {className: "icon icon-remove"}), mozL10n.get("remove_contact_menu_button2") ) @@ -312,9 +316,9 @@ loop.contacts = (function(_, mozL10n) { onClick: this.showDropdownMenu}) ), this.state.showMenu - ? React.createElement(ContactDropdown, {handleAction: this.handleAction, + ? React.createElement(ContactDropdown, {blocked: this.props.contact.blocked, canEdit: this.canEdit(), - blocked: this.props.contact.blocked}) + handleAction: this.handleAction}) : null ) @@ -549,8 +553,9 @@ loop.contacts = (function(_, mozL10n) { let viewForItem = item => { return ( - React.createElement(ContactDetail, {key: item._guid, contact: item, - handleContactAction: this.handleContactAction}) + React.createElement(ContactDetail, {contact: item, + handleContactAction: this.handleContactAction, + key: item._guid}) ); }; @@ -717,16 +722,23 @@ loop.contacts = (function(_, mozL10n) { ? mozL10n.get("add_contact_button") : mozL10n.get("edit_contact_title")), React.createElement("label", null, mozL10n.get("edit_contact_name_label")), - React.createElement("input", {ref: "name", required: true, pattern: "\\s*\\S.*", type: "text", - className: cx({pristine: this.state.pristine}), + React.createElement("input", {className: cx({pristine: this.state.pristine}), + pattern: "\\s*\\S.*", + ref: "name", + required: true, + type: "text", valueLink: this.linkState("name")}), React.createElement("label", null, mozL10n.get("edit_contact_email_label")), - React.createElement("input", {ref: "email", type: "email", required: phoneOrEmailRequired, - className: cx({pristine: this.state.pristine}), + React.createElement("input", {className: cx({pristine: this.state.pristine}), + ref: "email", + required: phoneOrEmailRequired, + type: "email", valueLink: this.linkState("email")}), React.createElement("label", null, mozL10n.get("new_contact_fxos_phone_placeholder")), - React.createElement("input", {ref: "tel", type: "tel", required: phoneOrEmailRequired, - className: cx({pristine: this.state.pristine}), + React.createElement("input", {className: cx({pristine: this.state.pristine}), + ref: "tel", + required: phoneOrEmailRequired, + type: "tel", valueLink: this.linkState("tel")}), React.createElement(ButtonGroup, null, React.createElement(Button, {additionalClass: "button-cancel", diff --git a/browser/components/loop/content/js/contacts.jsx b/browser/components/loop/content/js/contacts.jsx index c0771190377a..7f370ab5d52e 100644 --- a/browser/components/loop/content/js/contacts.jsx +++ b/browser/components/loop/content/js/contacts.jsx @@ -135,8 +135,8 @@ loop.contacts = (function(_, mozL10n) {
@@ -191,31 +191,35 @@ loop.contacts = (function(_, mozL10n) { "dropdown-menu-up": this.state.openDirUp })}>
  • + data-action="video-call" + onClick={this.onItemClick}> {mozL10n.get("video_call_menu_button")}
  • + data-action="audio-call" + onClick={this.onItemClick}> {mozL10n.get("audio_call_menu_button")}
  • + data-action="edit" + onClick={this.onItemClick}> {mozL10n.get("edit_contact_menu_button")}
  • + data-action={blockAction} + onClick={this.onItemClick}> {mozL10n.get(blockLabel)}
  • + data-action="remove" + onClick={this.onItemClick}> {mozL10n.get("remove_contact_menu_button2")}
    • @@ -312,9 +316,9 @@ loop.contacts = (function(_, mozL10n) { onClick={this.showDropdownMenu} />
    {this.state.showMenu - ? + handleAction={this.handleAction} /> : null } @@ -549,8 +553,9 @@ loop.contacts = (function(_, mozL10n) { let viewForItem = item => { return ( - + ); }; @@ -717,16 +722,23 @@ loop.contacts = (function(_, mozL10n) { ? mozL10n.get("add_contact_button") : mozL10n.get("edit_contact_title")} - - - @@ -654,24 +655,24 @@ loop.conversationViews = (function(mozL10n) {
    + video={this.props.video} /> ); @@ -729,11 +730,10 @@ loop.conversationViews = (function(mozL10n) { // for any state that render() doesn't manage. if (this.state.outgoing) { return (); + dispatcher={this.props.dispatcher} + enableCancelButton={this._isCancellable()} />); } // For incoming calls that are in accepting state, display the @@ -768,20 +768,18 @@ loop.conversationViews = (function(mozL10n) { } case CALL_STATES.TERMINATED: { return (); + dispatcher={this.props.dispatcher} + outgoing={this.state.outgoing} />); } case CALL_STATES.ONGOING: { return ( + remoteVideoEnabled={this.state.remoteVideoEnabled} + video={{enabled: !this.state.videoMuted}} /> ); } case CALL_STATES.FINISHED: { diff --git a/browser/components/loop/content/js/panel.js b/browser/components/loop/content/js/panel.js index 811619fafcb5..6d0530a9f505 100644 --- a/browser/components/loop/content/js/panel.js +++ b/browser/components/loop/content/js/panel.js @@ -82,14 +82,14 @@ loop.panel = (function(_, mozL10n) { if (!tab.props.hidden) { tabButtons.push( React.createElement("li", {className: cx({selected: isSelected}), - key: i, "data-tab-name": tabName, - title: mozL10n.get(tabName + "_tab_button_tooltip"), - onClick: this.handleSelectTab}) + key: i, + onClick: this.handleSelectTab, + title: mozL10n.get(tabName + "_tab_button_tooltip")}) ); } tabs.push( - React.createElement("div", {key: i, className: cx({tab: true, selected: isSelected})}, + React.createElement("div", {className: cx({tab: true, selected: isSelected}), key: i}, tab.props.children ) ); @@ -164,13 +164,13 @@ loop.panel = (function(_, mozL10n) { React.createElement("i", {className: availabilityStatus}) ), React.createElement("ul", {className: availabilityDropdown}, - React.createElement("li", {onClick: this.changeAvailability("available"), - className: "dropdown-menu-item dnd-make-available"}, + React.createElement("li", {className: "dropdown-menu-item dnd-make-available", + onClick: this.changeAvailability("available")}, React.createElement("i", {className: "status status-available"}), React.createElement("span", null, mozL10n.get("display_name_available_status")) ), - React.createElement("li", {onClick: this.changeAvailability("do-not-disturb"), - className: "dropdown-menu-item dnd-make-unavailable"}, + React.createElement("li", {className: "dropdown-menu-item dnd-make-unavailable", + onClick: this.changeAvailability("do-not-disturb")}, React.createElement("i", {className: "status status-dnd"}), React.createElement("span", null, mozL10n.get("display_name_dnd_status")) ) @@ -202,9 +202,9 @@ loop.panel = (function(_, mozL10n) { "clientShortname": mozL10n.get("clientShortname2") }) ), - React.createElement(Button, {htmlId: "fte-button", - onClick: this.handleButtonClick, - caption: mozL10n.get("first_time_experience_button_label")}) + React.createElement(Button, {caption: mozL10n.get("first_time_experience_button_label"), + htmlId: "fte-button", + onClick: this.handleButtonClick}) ) ); } @@ -291,9 +291,9 @@ loop.panel = (function(_, mozL10n) { var locale = mozL10n.getLanguage(); navigator.mozLoop.setLoopPref("showPartnerLogo", false); return ( - React.createElement("p", {id: "powered-by", className: "powered-by"}, + React.createElement("p", {className: "powered-by", id: "powered-by"}, mozL10n.get("powered_by_beforeLogo"), - React.createElement("img", {id: "powered-by-logo", className: locale}), + React.createElement("img", {className: locale, id: "powered-by-logo"}), mozL10n.get("powered_by_afterLogo") ) ); @@ -350,7 +350,7 @@ loop.panel = (function(_, mozL10n) { return null; } return ( - React.createElement("li", {onClick: this.props.onClick, className: "dropdown-menu-item"}, + React.createElement("li", {className: "dropdown-menu-item", onClick: this.props.onClick}, this.props.icon ? React.createElement("i", {className: "icon icon-" + this.props.icon}) : null, @@ -410,29 +410,29 @@ loop.panel = (function(_, mozL10n) { React.createElement("div", {className: "settings-menu dropdown"}, React.createElement("a", {className: "button-settings", onClick: this.toggleDropdownMenu, - title: mozL10n.get("settings_menu_button_tooltip"), - ref: "menu-button"}), + ref: "menu-button", + title: mozL10n.get("settings_menu_button_tooltip")}), React.createElement("ul", {className: cx({"dropdown-menu": true, hide: !this.state.showMenu})}, - React.createElement(SettingsDropdownEntry, {label: mozL10n.get("settings_menu_item_settings"), - onClick: this.handleClickSettingsEntry, - displayed: false, - icon: "settings"}), - React.createElement(SettingsDropdownEntry, {label: mozL10n.get("settings_menu_item_account"), - onClick: this.handleClickAccountEntry, + React.createElement(SettingsDropdownEntry, {displayed: false, + icon: "settings", + label: mozL10n.get("settings_menu_item_settings"), + onClick: this.handleClickSettingsEntry}), + React.createElement(SettingsDropdownEntry, {displayed: this._isSignedIn() && this.props.mozLoop.fxAEnabled, icon: "account", - displayed: this._isSignedIn() && this.props.mozLoop.fxAEnabled}), + label: mozL10n.get("settings_menu_item_account"), + onClick: this.handleClickAccountEntry}), React.createElement(SettingsDropdownEntry, {icon: "tour", label: mozL10n.get("tour_label"), onClick: this.openGettingStartedTour}), - React.createElement(SettingsDropdownEntry, {label: this._isSignedIn() ? + React.createElement(SettingsDropdownEntry, {displayed: this.props.mozLoop.fxAEnabled, + icon: this._isSignedIn() ? "signout" : "signin", + label: this._isSignedIn() ? mozL10n.get("settings_menu_item_signout") : mozL10n.get("settings_menu_item_signin"), - onClick: this.handleClickAuthEntry, - displayed: this.props.mozLoop.fxAEnabled, - icon: this._isSignedIn() ? "signout" : "signin"}), - React.createElement(SettingsDropdownEntry, {label: mozL10n.get("help_label"), - onClick: this.handleHelpEntry, - icon: "help"}) + onClick: this.handleClickAuthEntry}), + React.createElement(SettingsDropdownEntry, {icon: "help", + label: mozL10n.get("help_label"), + onClick: this.handleHelpEntry}) ) ) ); @@ -500,7 +500,7 @@ loop.panel = (function(_, mozL10n) { return ( React.createElement("div", {className: "room-entry-context-item"}, - React.createElement("a", {href: roomUrl.location, title: roomUrl.description, onClick: this.handleClick}, + React.createElement("a", {href: roomUrl.location, onClick: this.handleClick, title: roomUrl.description}, React.createElement("img", {src: roomUrl.thumbnail || "loop/shared/img/icons-16x16.svg#globe"}) ) ) @@ -587,17 +587,17 @@ loop.panel = (function(_, mozL10n) { }); return ( - React.createElement("div", {className: roomClasses, onMouseLeave: this.handleMouseLeave, - onClick: this.handleClickEntry}, + React.createElement("div", {className: roomClasses, onClick: this.handleClickEntry, + onMouseLeave: this.handleMouseLeave}, React.createElement("h2", null, React.createElement("span", {className: "room-notification"}), this.props.room.decryptedContext.roomName, React.createElement("button", {className: copyButtonClasses, - title: mozL10n.get("rooms_list_copy_url_tooltip"), - onClick: this.handleCopyButtonClick}), + onClick: this.handleCopyButtonClick, + title: mozL10n.get("rooms_list_copy_url_tooltip")}), React.createElement("button", {className: "delete-link", - title: mozL10n.get("rooms_list_delete_tooltip"), - onClick: this.handleDeleteButtonClick}) + onClick: this.handleDeleteButtonClick, + title: mozL10n.get("rooms_list_delete_tooltip")}) ), React.createElement(RoomEntryContextItem, {mozLoop: this.props.mozLoop, roomUrls: this.props.room.decryptedContext.urls}) @@ -670,11 +670,10 @@ loop.panel = (function(_, mozL10n) { this.state.rooms.map(function(room, i) { return ( React.createElement(RoomEntry, { - key: room.roomToken, dispatcher: this.props.dispatcher, + key: room.roomToken, mozLoop: this.props.mozLoop, - room: room} - ) + room: room}) ); }, this) ), @@ -788,8 +787,8 @@ loop.panel = (function(_, mozL10n) { useDesktopPaths: true}) ), React.createElement("button", {className: "btn btn-info new-room-button", - onClick: this.handleCreateButtonClick, - disabled: this.props.pendingOperation}, + disabled: this.props.pendingOperation, + onClick: this.handleCreateButtonClick}, mozL10n.get("rooms_new_room_button_label") ) ) @@ -923,8 +922,9 @@ loop.panel = (function(_, mozL10n) { if (!this.state.gettingStartedSeen) { return ( React.createElement("div", null, - React.createElement(NotificationListView, {notifications: this.props.notifications, - clearOnDocumentHidden: true}), + React.createElement(NotificationListView, { + clearOnDocumentHidden: true, + notifications: this.props.notifications}), React.createElement(GettingStartedView, null), React.createElement(ToSView, null) ) @@ -943,33 +943,44 @@ loop.panel = (function(_, mozL10n) { return ( React.createElement("div", null, - React.createElement(NotificationListView, {notifications: this.props.notifications, - clearOnDocumentHidden: true}), - React.createElement(TabView, {ref: "tabView", selectedTab: this.props.selectedTab, - buttonsHidden: hideButtons, mozLoop: this.props.mozLoop}, + React.createElement(NotificationListView, { + clearOnDocumentHidden: true, + notifications: this.props.notifications}), + React.createElement(TabView, { + buttonsHidden: hideButtons, + mozLoop: this.props.mozLoop, + ref: "tabView", + selectedTab: this.props.selectedTab}, React.createElement(Tab, {name: "rooms"}, React.createElement(RoomList, {dispatcher: this.props.dispatcher, + mozLoop: this.props.mozLoop, store: this.props.roomStore, - userDisplayName: this._getUserDisplayName(), - mozLoop: this.props.mozLoop}), + userDisplayName: this._getUserDisplayName()}), React.createElement(ToSView, null) ), React.createElement(Tab, {name: "contacts"}, - React.createElement(ContactsList, {selectTab: this.selectTab, - startForm: this.startForm, - notifications: this.props.notifications}) + React.createElement(ContactsList, { + notifications: this.props.notifications, + selectTab: this.selectTab, + startForm: this.startForm}) ), - React.createElement(Tab, {name: "contacts_add", hidden: true}, - React.createElement(ContactDetailsForm, {ref: "contacts_add", mode: "add", - selectTab: this.selectTab}) + React.createElement(Tab, {hidden: true, name: "contacts_add"}, + React.createElement(ContactDetailsForm, { + mode: "add", + ref: "contacts_add", + selectTab: this.selectTab}) ), - React.createElement(Tab, {name: "contacts_edit", hidden: true}, - React.createElement(ContactDetailsForm, {ref: "contacts_edit", mode: "edit", - selectTab: this.selectTab}) + React.createElement(Tab, {hidden: true, name: "contacts_edit"}, + React.createElement(ContactDetailsForm, { + mode: "edit", + ref: "contacts_edit", + selectTab: this.selectTab}) ), - React.createElement(Tab, {name: "contacts_import", hidden: true}, - React.createElement(ContactDetailsForm, {ref: "contacts_import", mode: "import", - selectTab: this.selectTab}) + React.createElement(Tab, {hidden: true, name: "contacts_import"}, + React.createElement(ContactDetailsForm, { + mode: "import", + ref: "contacts_import", + selectTab: this.selectTab}) ) ), React.createElement("div", {className: "footer"}, @@ -1004,10 +1015,10 @@ loop.panel = (function(_, mozL10n) { }); React.render(React.createElement(PanelView, { - notifications: notifications, - roomStore: roomStore, + dispatcher: dispatcher, mozLoop: navigator.mozLoop, - dispatcher: dispatcher}), document.querySelector("#main")); + notifications: notifications, + roomStore: roomStore}), document.querySelector("#main")); document.documentElement.setAttribute("lang", mozL10n.getLanguage()); document.documentElement.setAttribute("dir", mozL10n.getDirection()); diff --git a/browser/components/loop/content/js/panel.jsx b/browser/components/loop/content/js/panel.jsx index c0e8f1b3aa27..c5674d6c55de 100644 --- a/browser/components/loop/content/js/panel.jsx +++ b/browser/components/loop/content/js/panel.jsx @@ -82,14 +82,14 @@ loop.panel = (function(_, mozL10n) { if (!tab.props.hidden) { tabButtons.push(
  • + key={i} + onClick={this.handleSelectTab} + title={mozL10n.get(tabName + "_tab_button_tooltip")} /> ); } tabs.push( -
    +
    {tab.props.children}
    ); @@ -164,13 +164,13 @@ loop.panel = (function(_, mozL10n) {

      -
    • +
    • {mozL10n.get("display_name_available_status")}
      • -
    • +
    • {mozL10n.get("display_name_dnd_status")}
      • @@ -202,9 +202,9 @@ loop.panel = (function(_, mozL10n) { "clientShortname": mozL10n.get("clientShortname2") })} -
    ); } @@ -291,9 +291,9 @@ loop.panel = (function(_, mozL10n) { var locale = mozL10n.getLanguage(); navigator.mozLoop.setLoopPref("showPartnerLogo", false); return ( -

    +

    {mozL10n.get("powered_by_beforeLogo")} - + {mozL10n.get("powered_by_afterLogo")}

    ); @@ -350,7 +350,7 @@ loop.panel = (function(_, mozL10n) { return null; } return ( -
  • +
  • {this.props.icon ? : null} @@ -410,29 +410,29 @@ loop.panel = (function(_, mozL10n) { ); @@ -500,7 +500,7 @@ loop.panel = (function(_, mozL10n) { return ( @@ -587,17 +587,17 @@ loop.panel = (function(_, mozL10n) { }); return ( -
    +

    {this.props.room.decryptedContext.roomName}

    @@ -670,11 +670,10 @@ loop.panel = (function(_, mozL10n) { this.state.rooms.map(function(room, i) { return ( + room={room} /> ); }, this) }
    @@ -788,8 +787,8 @@ loop.panel = (function(_, mozL10n) { useDesktopPaths={true} />
    @@ -923,8 +922,9 @@ loop.panel = (function(_, mozL10n) { if (!this.state.gettingStartedSeen) { return (
    - +
    @@ -943,33 +943,44 @@ loop.panel = (function(_, mozL10n) { return (
    - - + + + userDisplayName={this._getUserDisplayName()} /> - + -
    @@ -1004,10 +1015,10 @@ loop.panel = (function(_, mozL10n) { }); React.render(, document.querySelector("#main")); + notifications={notifications} + roomStore={roomStore} />, document.querySelector("#main")); document.documentElement.setAttribute("lang", mozL10n.getLanguage()); document.documentElement.setAttribute("dir", mozL10n.getDirection()); diff --git a/browser/components/loop/content/js/roomViews.js b/browser/components/loop/content/js/roomViews.js index b3711932bfab..557d62230bf9 100644 --- a/browser/components/loop/content/js/roomViews.js +++ b/browser/components/loop/content/js/roomViews.js @@ -129,8 +129,8 @@ loop.roomViews = (function(mozL10n) { this.props.socialShareProviders.map(function(provider, idx) { return ( React.createElement("li", {className: "dropdown-menu-item", - key: "provider-" + idx, "data-provider": provider.origin, + key: "provider-" + idx, onClick: this.handleProviderClick}, React.createElement("img", {className: "icon", src: provider.iconURL}), React.createElement("span", null, provider.name) @@ -249,25 +249,25 @@ loop.roomViews = (function(mozL10n) { mozL10n.get("copy_url_button2") ), React.createElement("button", {className: "btn btn-info btn-share", - ref: "anchor", - onClick: this.handleShareButtonClick}, + onClick: this.handleShareButtonClick, + ref: "anchor"}, mozL10n.get("share_button3") ) ), React.createElement(SocialShareDropdown, { dispatcher: this.props.dispatcher, + ref: "menu", roomUrl: this.props.roomData.roomUrl, show: this.state.showMenu, - socialShareProviders: this.props.socialShareProviders, - ref: "menu"}), + socialShareProviders: this.props.socialShareProviders}), React.createElement(DesktopRoomContextView, { dispatcher: this.props.dispatcher, editMode: this.state.editMode, error: this.props.error, - savingContext: this.props.savingContext, mozLoop: this.props.mozLoop, onEditModeChange: this.handleEditModeChange, roomData: this.props.roomData, + savingContext: this.props.savingContext, show: this.props.showContext || this.state.editMode}) ) ); @@ -519,18 +519,21 @@ loop.roomViews = (function(mozL10n) { onChange: this.handleCheckboxChange, value: location}), React.createElement("form", {onSubmit: this.handleFormSubmit}, - React.createElement("input", {type: "text", className: "room-context-name", + React.createElement("input", {className: "room-context-name", onKeyDown: this.handleTextareaKeyDown, placeholder: mozL10n.get("context_edit_name_placeholder"), + type: "text", valueLink: this.linkState("newRoomName")}), - React.createElement("input", {type: "text", className: "room-context-url", + React.createElement("input", {className: "room-context-url", + disabled: availableContext && availableContext.url === this.state.newRoomURL, onKeyDown: this.handleTextareaKeyDown, placeholder: "https://", - disabled: availableContext && availableContext.url === this.state.newRoomURL, + type: "text", valueLink: this.linkState("newRoomURL")}), - React.createElement("textarea", {rows: "3", type: "text", className: "room-context-comments", + React.createElement("textarea", {className: "room-context-comments", onKeyDown: this.handleTextareaKeyDown, placeholder: mozL10n.get("context_edit_comments_placeholder"), + rows: "3", type: "text", valueLink: this.linkState("newRoomDescription")}) ), React.createElement("button", {className: "btn btn-info", @@ -769,35 +772,35 @@ loop.roomViews = (function(mozL10n) { React.createElement("div", {className: "video_wrapper remote_wrapper"}, React.createElement("div", {className: "video_inner remote focus-stream"}, React.createElement(sharedViews.MediaView, {displayAvatar: !this.shouldRenderRemoteVideo(), - posterUrl: this.props.remotePosterUrl, isLoading: this._shouldRenderRemoteLoading(), mediaType: "remote", + posterUrl: this.props.remotePosterUrl, srcVideoObject: this.state.remoteSrcVideoObject}) ) ), React.createElement("div", {className: localStreamClasses}, React.createElement(sharedViews.MediaView, {displayAvatar: this.state.videoMuted, - posterUrl: this.props.localPosterUrl, isLoading: this._shouldRenderLocalLoading(), mediaType: "local", + posterUrl: this.props.localPosterUrl, srcVideoObject: this.state.localSrcVideoObject}) ) ), React.createElement(sharedViews.ConversationToolbar, { - dispatcher: this.props.dispatcher, - video: {enabled: !this.state.videoMuted, visible: true}, audio: {enabled: !this.state.audioMuted, visible: true}, - publishStream: this.publishStream, + dispatcher: this.props.dispatcher, hangup: this.leaveRoom, - screenShare: screenShareData}) + publishStream: this.publishStream, + screenShare: screenShareData, + video: {enabled: !this.state.videoMuted, visible: true}}) ) ), React.createElement(DesktopRoomContextView, { dispatcher: this.props.dispatcher, error: this.state.error, - savingContext: this.state.savingContext, mozLoop: this.props.mozLoop, roomData: roomData, + savingContext: this.state.savingContext, show: !shouldRenderInvitationOverlay && shouldRenderContextView}), React.createElement(sharedViews.TextChatView, { dispatcher: this.props.dispatcher, diff --git a/browser/components/loop/content/js/roomViews.jsx b/browser/components/loop/content/js/roomViews.jsx index 2b5bb0344526..6fddf7ba1220 100644 --- a/browser/components/loop/content/js/roomViews.jsx +++ b/browser/components/loop/content/js/roomViews.jsx @@ -129,8 +129,8 @@ loop.roomViews = (function(mozL10n) { this.props.socialShareProviders.map(function(provider, idx) { return (
  • {provider.name} @@ -249,25 +249,25 @@ loop.roomViews = (function(mozL10n) { mozL10n.get("copy_url_button2")} + socialShareProviders={this.props.socialShareProviders} /> ); @@ -519,18 +519,21 @@ loop.roomViews = (function(mozL10n) { onChange={this.handleCheckboxChange} value={location} />
    - - -