summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--browser/branding/shared/branding.mozbuild4
-rw-r--r--devtools/client/locales/en-US/inspector.properties2
-rw-r--r--devtools/client/netmonitor/test/browser_net_curl-utils.js11
-rw-r--r--devtools/client/netmonitor/test/html_curl-utils.html17
-rw-r--r--devtools/client/shared/curl.js2
-rw-r--r--devtools/client/storage/storage.xul2
-rw-r--r--devtools/client/storage/ui.js12
-rw-r--r--devtools/client/themes/images/reload.svg5
-rw-r--r--devtools/client/themes/storage.css6
-rw-r--r--toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm7
-rw-r--r--toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm4
11 files changed, 57 insertions, 15 deletions
diff --git a/browser/branding/shared/branding.mozbuild b/browser/branding/shared/branding.mozbuild
index 29d25094f..e6fee3f4e 100644
--- a/browser/branding/shared/branding.mozbuild
+++ b/browser/branding/shared/branding.mozbuild
@@ -33,9 +33,9 @@ def ApplicationBranding():
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
BRANDING_FILES += [
'../shared/dsstore',
+ 'background.png',
'disk.icns',
'document.icns',
- 'background.png',
'firefox.icns',
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@@ -53,4 +53,4 @@ def ApplicationBranding():
]
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY']
- DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U'] \ No newline at end of file
+ DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']
diff --git a/devtools/client/locales/en-US/inspector.properties b/devtools/client/locales/en-US/inspector.properties
index b6f3e072b..252d72bfa 100644
--- a/devtools/client/locales/en-US/inspector.properties
+++ b/devtools/client/locales/en-US/inspector.properties
@@ -66,7 +66,7 @@ inspector.collapsePane=Collapse pane
# inspector UI.
inspector.expandPane=Expand pane
-# LOCALIZATION NOTE (inspector.searchResultsCount): This is the label that
+# LOCALIZATION NOTE (inspector.searchResultsCount2): This is the label that
# will show up next to the inspector search box. %1$S is the current result
# index and %2$S is the total number of search results. For example: "3 of 9".
# This won't be visible until the search box is updated in Bug 835896.
diff --git a/devtools/client/netmonitor/test/browser_net_curl-utils.js b/devtools/client/netmonitor/test/browser_net_curl-utils.js
index 0d35c6141..afac78cfc 100644
--- a/devtools/client/netmonitor/test/browser_net_curl-utils.js
+++ b/devtools/client/netmonitor/test/browser_net_curl-utils.js
@@ -18,7 +18,7 @@ add_task(function* () {
RequestsMenu.lazyUpdate = false;
- let wait = waitForNetworkEvents(monitor, 1, 3);
+ let wait = waitForNetworkEvents(monitor, 1, 4);
yield ContentTask.spawn(tab.linkedBrowser, SIMPLE_SJS, function* (url) {
content.wrappedJSObject.performRequests(url);
});
@@ -27,8 +27,9 @@ add_task(function* () {
let requests = {
get: RequestsMenu.getItemAtIndex(0),
post: RequestsMenu.getItemAtIndex(1),
- multipart: RequestsMenu.getItemAtIndex(2),
- multipartForm: RequestsMenu.getItemAtIndex(3)
+ patch: RequestsMenu.getItemAtIndex(2),
+ multipart: RequestsMenu.getItemAtIndex(3),
+ multipartForm: RequestsMenu.getItemAtIndex(4)
};
let data = yield createCurlData(requests.get.attachment, gNetwork);
@@ -40,6 +41,10 @@ add_task(function* () {
testWriteEmptyPostDataTextParams(data);
testDataArgumentOnGeneratedCommand(data);
+ data = yield createCurlData(requests.patch.attachment, gNetwork);
+ testWritePostDataTextParams(data);
+ testDataArgumentOnGeneratedCommand(data);
+
data = yield createCurlData(requests.multipart.attachment, gNetwork);
testIsMultipartRequest(data);
testGetMultipartBoundary(data);
diff --git a/devtools/client/netmonitor/test/html_curl-utils.html b/devtools/client/netmonitor/test/html_curl-utils.html
index 8ff7ecdf0..eb5c0c5b6 100644
--- a/devtools/client/netmonitor/test/html_curl-utils.html
+++ b/devtools/client/netmonitor/test/html_curl-utils.html
@@ -52,6 +52,17 @@
xhr.send(params);
}
+ function ajaxPatch(aUrl, aCallback) {
+ let xhr = new XMLHttpRequest();
+ xhr.open("PATCH", aUrl, true);
+ xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+ xhr.onload = function() {
+ aCallback();
+ };
+ var params = "param1=value1&param2=value2&param3=value3";
+ xhr.send(params);
+ }
+
function ajaxMultipart(aUrl, aCallback) {
var xhr = new XMLHttpRequest();
xhr.open("POST", aUrl, true);
@@ -88,8 +99,10 @@
function performRequests(aUrl) {
ajaxGet(aUrl, () => {
ajaxPost(aUrl, () => {
- ajaxMultipart(aUrl, () => {
- submitForm();
+ ajaxPatch(aUrl, () => {
+ ajaxMultipart(aUrl, () => {
+ submitForm();
+ });
});
});
});
diff --git a/devtools/client/shared/curl.js b/devtools/client/shared/curl.js
index 45122be37..420fe6aa5 100644
--- a/devtools/client/shared/curl.js
+++ b/devtools/client/shared/curl.js
@@ -77,7 +77,7 @@ const Curl = {
// Create post data.
let postData = [];
if (utils.isUrlEncodedRequest(data) ||
- ["PUT", "POST"].includes(data.method)) {
+ ["PUT", "POST", "PATCH"].includes(data.method)) {
postDataText = data.postDataText;
postData.push("--data");
postData.push(escapeString(utils.writePostDataTextParams(postDataText)));
diff --git a/devtools/client/storage/storage.xul b/devtools/client/storage/storage.xul
index a91900add..fa006ac7c 100644
--- a/devtools/client/storage/storage.xul
+++ b/devtools/client/storage/storage.xul
@@ -48,6 +48,8 @@
<hbox id="storage-toolbar" class="devtools-toolbar">
<button id="add-button"
class="devtools-button add-button"></button>
+ <button id="refresh-button"
+ class="devtools-button refresh-button"></button>
<spacer flex="1"/>
<textbox id="storage-searchbox"
class="devtools-filterinput"
diff --git a/devtools/client/storage/ui.js b/devtools/client/storage/ui.js
index ef07a8e88..7745c8da9 100644
--- a/devtools/client/storage/ui.js
+++ b/devtools/client/storage/ui.js
@@ -160,6 +160,7 @@ function StorageUI(front, target, panelWin, toolbox) {
this._tablePopup = this._panelDoc.getElementById("storage-table-popup");
this._tablePopup.addEventListener("popupshowing", this.onTablePopupShowing);
+ this.onRefreshTable = this.onRefreshTable.bind(this);
this.onAddItem = this.onAddItem.bind(this);
this.onRemoveItem = this.onRemoveItem.bind(this);
this.onRemoveAllFrom = this.onRemoveAllFrom.bind(this);
@@ -167,6 +168,9 @@ function StorageUI(front, target, panelWin, toolbox) {
this.onRemoveAllSessionCookies = this.onRemoveAllSessionCookies.bind(this);
this.onRemoveTreeItem = this.onRemoveTreeItem.bind(this);
+ this._refreshButton = this._panelDoc.getElementById("refresh-button");
+ this._refreshButton.addEventListener("command", this.onRefreshTable);
+
this._addButton = this._panelDoc.getElementById("add-button");
this._addButton.addEventListener("command", this.onAddItem);
@@ -229,6 +233,7 @@ StorageUI.prototype = {
this.searchBox = null;
this._treePopup.removeEventListener("popupshowing", this.onTreePopupShowing);
+ this._refreshButton.removeEventListener("command", this.onRefreshTable);
this._addButton.removeEventListener("command", this.onAddItem);
this._tablePopupAddItem.removeEventListener("command", this.onAddItem);
this._treePopupDeleteAll.removeEventListener("command", this.onRemoveAll);
@@ -1121,6 +1126,13 @@ StorageUI.prototype = {
},
/**
+ * Handles refreshing the selected storage
+ */
+ onRefreshTable: function (event) {
+ this.onHostSelect(event, this.tree.selectedItem);
+ },
+
+ /**
* Handles adding an item from the storage
*/
onAddItem: function () {
diff --git a/devtools/client/themes/images/reload.svg b/devtools/client/themes/images/reload.svg
index b04262784..c5d9bf991 100644
--- a/devtools/client/themes/images/reload.svg
+++ b/devtools/client/themes/images/reload.svg
@@ -1,6 +1,7 @@
<!-- 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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 14 14" width="14" height="14">
- <path d="M12,7H6l2.4-2.4C7.6,4,6.6,3.8,5.5,4.1C4.3,4.5,3.3,5.5,3,6.8 C2.6,9,4.3,11,6.5,11c1,0,2-0.5,2.6-1.2l1.7,1c-1.3,1.6-3.3,2.5-5.6,2c-2-0.5-3.6-2.1-4-4.1C0.4,5.1,3.1,2,6.5,2 c1.3,0,2.4,0.4,3.3,1.2L12,1V7z"/>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="M13.917 7C13.44 4.162 10.973 2 8 2 4.686 2 2 4.686 2 8s2.686 6 6 6c2.22 0 4.16-1.207 5.197-3H12c-.912 1.214-2.364 2-4 2-2.76 0-5-2.24-5-5s2.24-5 5-5c2.42 0 4.437 1.718 4.9 4h1.017z"/>
+ <path d="M14 1L8 7h6V1zm-1 1L9 6h4V2z" fill-rule="evenodd"/>
</svg>
diff --git a/devtools/client/themes/storage.css b/devtools/client/themes/storage.css
index 1d4da9bd6..314b6b7fe 100644
--- a/devtools/client/themes/storage.css
+++ b/devtools/client/themes/storage.css
@@ -38,6 +38,12 @@
-moz-user-focus: normal;
}
+#storage-toolbar .refresh-button::before {
+ margin: 0;
+ background-image: url("chrome://devtools/skin/images/reload.svg");
+ -moz-user-focus: normal;
+}
+
#storage-toolbar .devtools-button {
min-width: unset;
}
diff --git a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
index 7e86fceab..d68a0f175 100644
--- a/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/extensions/internal/AddonUpdateChecker.jsm
@@ -765,8 +765,9 @@ this.AddonUpdateChecker = {
* @return UpdateParser so that the caller can use UpdateParser.cancel() to shut
* down in-progress update requests
*/
- checkForUpdates: function AUC_checkForUpdates(aId, aUpdateKey, aUrl,
- aObserver) {
- return new UpdateParser(aId, aUpdateKey, aUrl, aObserver);
+ checkForUpdates: function AUC_checkForUpdates(aId, aUpdateKey, aUrl, aObserver) {
+ // Exclude default theme
+ if (aId != "{972ce4c6-7e08-4474-a285-3208198ce6fd}")
+ return new UpdateParser(aId, aUpdateKey, aUrl, aObserver);
}
};
diff --git a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
index 63c16737c..918ba5328 100644
--- a/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
+++ b/toolkit/mozapps/webextensions/internal/AddonUpdateChecker.jsm
@@ -929,6 +929,8 @@ this.AddonUpdateChecker = {
* down in-progress update requests
*/
checkForUpdates: function(aId, aUpdateKey, aUrl, aObserver) {
- return new UpdateParser(aId, aUpdateKey, aUrl, aObserver);
+ // Exclude default theme
+ if (aId != "{972ce4c6-7e08-4474-a285-3208198ce6fd}")
+ return new UpdateParser(aId, aUpdateKey, aUrl, aObserver);
}
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 01:26:52 +0000