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

Lines changed: 220 additions & 169 deletions

File tree

‎configuration/chrome/configuration.properties‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 4 deletions
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‎

Lines changed: 4 additions & 16 deletions
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‎

Lines changed: 16 additions & 16 deletions
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‎

Lines changed: 1 addition & 4 deletions
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‎

Lines changed: 13 additions & 31 deletions
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
}

0 commit comments

Comments
 (0)