Skip to content

Commit 36e50dd

Browse files
chrispederickchrispederick
committed
Updates for Chrome 0.4.8, Firefox 1.2.12 and Opera 0.2.2
1 parent 50e830d commit 36e50dd

37 files changed

+220
-169
lines changed

‎configuration/chrome/configuration.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
common.prefix=
22
description=Adds a toolbar button with various web developer tools. The official port of the Web Developer extension for Firefox.
3-
version=0.4.7
3+
version=0.4.8

‎configuration/firefox/configuration.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
common.prefix=chrome://web-developer/content
22
description=Adds a menu and a toolbar with various web developer tools.
3-
version=1.2.11
3+
version=1.2.12

‎configuration/firefox/install.rdf

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<em:targetApplication>
4949
<Description>
5050
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
51-
<em:maxVersion>49.*</em:maxVersion>
51+
<em:maxVersion>51.*</em:maxVersion>
5252
<em:minVersion>3.6</em:minVersion>
5353
</Description>
5454
</em:targetApplication>

‎configuration/opera/configuration.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
common.prefix=
22
description=Adds a toolbar button with various web developer tools. The official port of the Web Developer extension for Firefox.
3-
version=0.2.1
3+
version=0.2.2

‎source/chrome/html/overlay/overlay.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@
105105
<li><a href="#" id="make-form-fields-writable"><span></span></a></li>
106106
<li><a href="#" id="outline-form-fields-without-labels"><span></span></a></li>
107107
<li><a href="#" id="populate-form-fields"><span></span></a></li>
108+
<li><a href="#" id="remove-form-validation"><span></span></a></li>
108109
<li><a href="#" id="remove-maximum-lengths"><span></span></a></li>
109110
<li><a href="#" id="view-form-information"><span></span></a></li>
110-
<li><a href="#" id="disable-form-validation"><span></span></a></li>
111111
</ul>
112112
</div>
113113

‎source/chrome/javascript/overlay/cookies.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,7 @@ WebDeveloper.Overlay.Cookies.submitAddCookie = function()
235235
// Toggles cookies
236236
WebDeveloper.Overlay.Cookies.toggleCookies = function()
237237
{
238-
var menu = $(this);
239-
240-
WebDeveloper.Overlay.toggleContentSetting("cookies", menu, "http://*/*", "enableCookiesResult", "disableCookiesResult");
241-
WebDeveloper.Overlay.toggleContentSetting("cookies", menu, "https://*/*");
238+
WebDeveloper.Overlay.toggleContentSetting("cookies", $(this), "enableCookiesResult", "disableCookiesResult");
242239
};
243240

244241
// Returns true if the add dialog is valid

‎source/chrome/javascript/overlay/disable.js

+4-16
Original file line numberDiff line numberDiff line change
@@ -43,35 +43,23 @@ WebDeveloper.Overlay.Disable.resetFeatures = function()
4343
// Toggles JavaScript
4444
WebDeveloper.Overlay.Disable.toggleJavaScript = function()
4545
{
46-
var menu = $(this);
47-
48-
WebDeveloper.Overlay.toggleContentSetting("javascript", menu, "http://*/*", "enableJavaScriptResult", "disableJavaScriptResult");
49-
WebDeveloper.Overlay.toggleContentSetting("javascript", menu, "https://*/*");
46+
WebDeveloper.Overlay.toggleContentSetting("javascript", $(this), "enableJavaScriptResult", "disableJavaScriptResult");
5047
};
5148

5249
// Toggles notifications
5350
WebDeveloper.Overlay.Disable.toggleNotifications = function()
5451
{
55-
var menu = $(this);
56-
57-
WebDeveloper.Overlay.toggleContentSetting("notifications", menu, "http://*/*", "enableNotificationsResult", "disableNotificationsResult");
58-
WebDeveloper.Overlay.toggleContentSetting("notifications", menu, "https://*/*");
52+
WebDeveloper.Overlay.toggleContentSetting("notifications", $(this), "enableNotificationsResult", "disableNotificationsResult");
5953
};
6054

6155
// Toggles plugins
6256
WebDeveloper.Overlay.Disable.togglePlugins = function()
6357
{
64-
var menu = $(this);
65-
66-
WebDeveloper.Overlay.toggleContentSetting("plugins", menu, "http://*/*", "enablePluginsResult", "disablePluginsResult");
67-
WebDeveloper.Overlay.toggleContentSetting("plugins", menu, "https://*/*");
58+
WebDeveloper.Overlay.toggleContentSetting("plugins", $(this), "enablePluginsResult", "disablePluginsResult");
6859
};
6960

7061
// Toggles popups
7162
WebDeveloper.Overlay.Disable.togglePopups = function()
7263
{
73-
var menu = $(this);
74-
75-
WebDeveloper.Overlay.toggleContentSetting("popups", menu, "http://*/*", "enablePopupsResult", "disablePopupsResult");
76-
WebDeveloper.Overlay.toggleContentSetting("popups", menu, "https://*/*");
64+
WebDeveloper.Overlay.toggleContentSetting("popups", $(this), "enablePopupsResult", "disablePopupsResult");
7765
};

‎source/chrome/javascript/overlay/forms.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ $(function()
2020
$("#make-form-fields-writable").append(WebDeveloper.Locales.getString("makeFormFieldsWritable")).on("click", WebDeveloper.Overlay.Forms.makeFormFieldsWritable);
2121
$("#outline-form-fields-without-labels").append(WebDeveloper.Locales.getString("outlineFormFieldsWithoutLabels")).on("click", WebDeveloper.Overlay.Forms.outlineFormFieldsWithoutLabels);
2222
$("#populate-form-fields").append(WebDeveloper.Locales.getString("populateFormFields")).on("click", WebDeveloper.Overlay.Forms.populateFormFields);
23+
$("#remove-form-validation").append(WebDeveloper.Locales.getString("removeFormValidation")).on("click", WebDeveloper.Overlay.Forms.removeFormValidation);
2324
$("#remove-maximum-lengths").append(WebDeveloper.Locales.getString("removeMaximumLengths")).on("click", WebDeveloper.Overlay.Forms.removeMaximumLengths);
2425
$("#uncheck-all-checkboxes").append(WebDeveloper.Locales.getString("uncheckAllCheckboxes")).on("click", WebDeveloper.Overlay.Forms.uncheckAllCheckboxes);
2526
$("#view-form-information").append(WebDeveloper.Locales.getString("viewFormInformation")).on("click", WebDeveloper.Overlay.Forms.viewFormInformation);
26-
$("#disable-form-validation").append(WebDeveloper.Locales.getString("disableFormValidation")).on("click", WebDeveloper.Overlay.Forms.disableFormValidation);
2727
});
2828

2929
// Adds a feature on a tab
@@ -248,6 +248,21 @@ WebDeveloper.Overlay.Forms.populateFormFields = function()
248248
});
249249
};
250250

251+
// Removes validation on all form fields
252+
WebDeveloper.Overlay.Forms.removeFormValidation = function()
253+
{
254+
var featureItem = $(this);
255+
256+
WebDeveloper.Overlay.getSelectedTab(function(tab)
257+
{
258+
// If the tab is valid
259+
if(WebDeveloper.Overlay.isValidTab(tab))
260+
{
261+
WebDeveloper.Overlay.Forms.addFeatureOnTab(featureItem, tab, "WebDeveloper.Forms.removeFormValidation([document]);");
262+
}
263+
});
264+
};
265+
251266
// Removes maximum lengths from all elements
252267
WebDeveloper.Overlay.Forms.removeMaximumLengths = function()
253268
{
@@ -299,18 +314,3 @@ WebDeveloper.Overlay.Forms.viewFormInformation = function()
299314
}
300315
});
301316
};
302-
303-
// Disables HTML5 validation
304-
WebDeveloper.Overlay.Forms.disableFormValidation = function()
305-
{
306-
var featureItem = $(this);
307-
308-
WebDeveloper.Overlay.getSelectedTab(function(tab)
309-
{
310-
// If the tab is valid
311-
if(WebDeveloper.Overlay.isValidTab(tab))
312-
{
313-
WebDeveloper.Overlay.Forms.addFeatureOnTab(featureItem, tab, "WebDeveloper.Forms.disableFormValidation([document]);");
314-
}
315-
});
316-
};

‎source/chrome/javascript/overlay/images.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,7 @@ WebDeveloper.Overlay.Images.toggleFeatureOnTab = function(featureItem, tab, scri
337337
// Toggles images
338338
WebDeveloper.Overlay.Images.toggleImages = function()
339339
{
340-
var menu = $(this);
341-
342-
WebDeveloper.Overlay.toggleContentSetting("images", menu, "http://*/*", "enableImagesResult", "disableImagesResult");
343-
WebDeveloper.Overlay.toggleContentSetting("images", menu, "https://*/*");
340+
WebDeveloper.Overlay.toggleContentSetting("images", $(this), "enableImagesResult", "disableImagesResult");
344341
};
345342

346343
// Displays all the images

‎source/chrome/javascript/overlay/overlay.js

+13-31
Original file line numberDiff line numberDiff line change
@@ -266,43 +266,27 @@ WebDeveloper.Overlay.openURL = function(event)
266266
};
267267

268268
// Toggles a content setting
269-
WebDeveloper.Overlay.toggleContentSetting = function(settingType, menu, url, enableMessage, disableMessage)
269+
WebDeveloper.Overlay.toggleContentSetting = function(settingType, menu, enableMessage, disableMessage)
270270
{
271-
chrome.contentSettings[settingType].get({ primaryUrl: url }, function(details)
271+
chrome.contentSettings[settingType].get({ primaryUrl: "http://*/*" }, function(details)
272272
{
273-
var callback = null;
274-
var setting = details.setting;
275-
276-
// If the setting is currently set to block
277-
if(setting == "block")
273+
// If the setting is currently set to allow
274+
if(details.setting == "allow")
278275
{
279-
setting = "allow";
276+
chrome.contentSettings[settingType].set({ primaryPattern: "<all_urls>", setting: "block" }, function()
277+
{
278+
WebDeveloper.Overlay.updateContentSettingMenu(menu, settingType);
279+
WebDeveloper.Overlay.displayNotification(WebDeveloper.Locales.getString(disableMessage));
280+
});
280281
}
281282
else
282283
{
283-
setting = "block";
284-
}
285-
286-
// If the enable and disable message are set
287-
if(enableMessage && disableMessage)
288-
{
289-
callback = function()
284+
chrome.contentSettings[settingType].clear({}, function()
290285
{
291286
WebDeveloper.Overlay.updateContentSettingMenu(menu, settingType);
292-
293-
// If the setting is being allowed
294-
if(setting == "allow")
295-
{
296-
WebDeveloper.Overlay.displayNotification(WebDeveloper.Locales.getString(enableMessage));
297-
}
298-
else
299-
{
300-
WebDeveloper.Overlay.displayNotification(WebDeveloper.Locales.getString(disableMessage));
301-
}
302-
};
287+
WebDeveloper.Overlay.displayNotification(WebDeveloper.Locales.getString(enableMessage));
288+
});
303289
}
304-
305-
chrome.contentSettings[settingType].set({ primaryPattern: url, setting: setting }, callback);
306290
});
307291
};
308292

@@ -333,10 +317,8 @@ WebDeveloper.Overlay.updateContentSettingMenu = function(menu, settingType)
333317
{
334318
chrome.contentSettings[settingType].get({ primaryUrl: "http://*/*" }, function(details)
335319
{
336-
var setting = details.setting;
337-
338320
// If the setting is currently set to block
339-
if(setting == "block")
321+
if(details.setting == "block")
340322
{
341323
menu.addClass("active");
342324
}

‎source/chrome/javascript/overlay/tools.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ WebDeveloper.Overlay.Tools.customTool = function()
2121

2222
WebDeveloper.Overlay.getSelectedTab(function(tab)
2323
{
24-
WebDeveloper.Overlay.openTab(featureItem.data("url") + tab.url);
24+
WebDeveloper.Overlay.openTab(featureItem.data("url") + encodeURIComponent(tab.url));
2525
});
2626
};
2727

‎source/chrome/javascript/upgrade/upgrade.js

+37-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,35 @@ var WebDeveloper = WebDeveloper || {}; // eslint-disable-line no-use-before-defi
22

33
WebDeveloper.Upgrade = WebDeveloper.Upgrade || {};
44

5+
// Fixes a content setting
6+
WebDeveloper.Upgrade.fixContentSetting = function(settingType)
7+
{
8+
chrome.contentSettings[settingType].get({ primaryUrl: "http://*/*" }, function(details)
9+
{
10+
// If the setting is currently set to allow
11+
if(details.setting == "allow")
12+
{
13+
chrome.contentSettings[settingType].clear({});
14+
}
15+
});
16+
};
17+
18+
// Fixes the content settings
19+
WebDeveloper.Upgrade.fixContentSettings = function()
20+
{
21+
// If content settings exists
22+
if(chrome.contentSettings)
23+
{
24+
var settingTypes = ["cookies", "images", "javascript", "notifications", "plugins", "popups"];
25+
26+
// Loop through the setting types
27+
for(var i = 0, l = settingTypes.length; i < l; i++)
28+
{
29+
WebDeveloper.Upgrade.fixContentSetting(settingTypes[i]);
30+
}
31+
}
32+
};
33+
534
// Migrates the tools
635
WebDeveloper.Upgrade.migrateTools = function()
736
{
@@ -82,7 +111,8 @@ WebDeveloper.Upgrade.setupDefaultOptions = function()
82111
// Upgrades the extension
83112
WebDeveloper.Upgrade.upgrade = function()
84113
{
85-
var previousVersion = WebDeveloper.Storage.getItem("version");
114+
var contentSettingsVersion = "0.4.8";
115+
var previousVersion = WebDeveloper.Storage.getItem("version");
86116

87117
// If the versions do not match
88118
if(previousVersion != "@version@")
@@ -92,6 +122,12 @@ WebDeveloper.Upgrade.upgrade = function()
92122
WebDeveloper.Upgrade.migrateTools();
93123
}
94124

125+
// If this is the content settings version
126+
if(contentSettingsVersion == "@version@")
127+
{
128+
WebDeveloper.Upgrade.fixContentSettings();
129+
}
130+
95131
WebDeveloper.Upgrade.setupDefaultOptions();
96132
};
97133

‎source/chrome/locales/en_US/messages.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,10 @@
121121
"makeFormFieldsWritable": { "message": "Make Form Fields Writable" },
122122
"outlineFormFieldsWithoutLabels": { "message": "Outline Form Fields Without Labels" },
123123
"populateFormFields": { "message": "Populate Form Fields" },
124+
"removeFormValidation": { "message": "Remove Form Validation" },
124125
"removeMaximumLengths": { "message": "Remove Maximum Lengths" },
125126
"uncheckAllCheckboxes": { "message": "Uncheck All Checkboxes" },
126127
"viewFormInformation": { "message": "View Form Information" },
127-
"disableFormValidation": { "message": "Disable HTML5 Validation" },
128-
"disableFormValidationSingleResult": { "message": "1 validation element was disabled." },
129-
"disableFormValidationMultipleResult": { "message": "$count$ validation elements were disabled.", "placeholders": { "count": { "content": "$1" } } },
130128

131129
"disableImages": { "message": "Disable Images" },
132130
"displayAltAttributes": { "message": "Display Alt Attributes" },
@@ -270,10 +268,10 @@
270268
"descriptionCannotBeEmpty": { "message": "The description cannot be empty." },
271269
"disableCookiesResult": { "message": "Cookies have been disabled." },
272270
"disableImagesResult": { "message": "Images have been disabled." },
273-
"disableJavaScriptResult": { "message": "JavaScript has been disabled for all sites." },
274-
"disableNotificationsResult": { "message": "Notifications have been disabled for all sites." },
275-
"disablePluginsResult": { "message": "Plugins have been disabled for all sites." },
276-
"disablePopupsResult": { "message": "Popups have been disabled for all sites." },
271+
"disableJavaScriptResult": { "message": "JavaScript has been disabled." },
272+
"disableNotificationsResult": { "message": "Notifications have been disabled." },
273+
"disablePluginsResult": { "message": "Plugins have been disabled." },
274+
"disablePopupsResult": { "message": "Popups have been disabled." },
277275
"displayPasswordsSingleResult": { "message": "1 password displayed." },
278276
"displayPasswordsMultipleResult": { "message": "$count$ passwords displayed.", "placeholders": { "count": { "content": "$1" } } },
279277
"displayWindowSizeResult": { "message": "Window: $outerWidth$px x $outerHeight$px &nbsp;&nbsp;&nbsp; Viewport: $innerWidth$px x $innerHeight$px", "placeholders": { "outerWidth": { "content": "$1" }, "outerHeight": { "content": "$2" }, "innerWidth": { "content": "$3" }, "innerHeight": { "content": "$4" } } },
@@ -291,10 +289,10 @@
291289
"enableFormFieldsSingleResult": { "message": "1 form field enabled." },
292290
"enableFormFieldsMultipleResult": { "message": "$count$ form fields enabled.", "placeholders": { "count": { "content": "$1" } } },
293291
"enableImagesResult": { "message": "Images have been enabled." },
294-
"enableJavaScriptResult": { "message": "JavaScript has been enabled for all sites. <a href=\"@url@/help/#allow-notifications\" class=\"alert-link\" target=\"_blank\">Why all sites?</a>" },
295-
"enableNotificationsResult": { "message": "Notifications have been enabled for all sites. <a href=\"@url@/help/#allow-notifications\" class=\"alert-link\" target=\"_blank\">Why all sites?</a>" },
296-
"enablePluginsResult": { "message": "Plugins have been enabled for all sites. <a href=\"@url@/help/#allow-notifications\" class=\"alert-link\" target=\"_blank\">Why all sites?</a>" },
297-
"enablePopupsResult": { "message": "Popups have been enabled for all sites. <a href=\"@url@/help/#allow-notifications\" class=\"alert-link\" target=\"_blank\">Why all sites?</a>" },
292+
"enableJavaScriptResult": { "message": "JavaScript has been enabled." },
293+
"enableNotificationsResult": { "message": "Notifications have been enabled." },
294+
"enablePluginsResult": { "message": "Plugins have been enabled." },
295+
"enablePopupsResult": { "message": "Popups have been enabled." },
298296
"endPositionX": { "message": "End Position: X =" },
299297
"expandAll": { "message": "Expand all" },
300298
"expandSelectElementsSingleResult": { "message": "1 select element expanded." },
@@ -335,6 +333,8 @@
335333
"reloadImagesResult": { "message": "The images have been reloaded." },
336334
"reloadLayouts": { "message": "Reload Layouts" },
337335
"reloadLinkedStyleSheetsResult": { "message": "The linked style sheets have been reloaded." },
336+
"removeFormValidationMultipleResult": { "message": "Removed validation from $count$ form fields.", "placeholders": { "count": { "content": "$1" } } },
337+
"removeFormValidationSingleResult": { "message": "Removed validation from 1 form field." },
338338
"removeMaximumLengthsSingleResult": { "message": "Removed maximum length from 1 form field." },
339339
"removeMaximumLengthsMultipleResult": { "message": "Removed maximum length from $count$ form fields.", "placeholders": { "count": { "content": "$1" } } },
340340
"resetDisableFeatures": { "message": "Reset Disable Features" },

‎source/common/javascript/dashboard/element-information.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,7 @@ WebDeveloper.ElementInformation.generateTextInformation = function(element, cont
329329
var textInformation = generatedDocument.createElement("div");
330330
var textContent = "";
331331

332-
childElement.appendChild(contentDocument.createTextNode(WebDeveloper.ElementInformation.getLocaleString("text")));
333-
332+
childElement.appendChild(generatedDocument.createTextNode(WebDeveloper.ElementInformation.getLocaleString("text")));
334333
textInformation.setAttribute("class", "col-sm-6 web-developer-css");
335334
textInformation.appendChild(childElement);
336335

@@ -350,7 +349,7 @@ WebDeveloper.ElementInformation.generateTextInformation = function(element, cont
350349
textContent = textContent.trim();
351350
}
352351

353-
childElement.appendChild(contentDocument.createTextNode(textContent));
352+
childElement.appendChild(generatedDocument.createTextNode(textContent));
354353
textInformation.appendChild(childElement);
355354

356355
return textInformation;

0 commit comments

Comments
 (0)