Closed
Bug 1038604
Opened 12 years ago
Closed 12 years ago
Rename disableMCB to allowMixedContent
Categories
(Firefox :: General, defect)
Firefox
General
Tracking
()
RESOLVED
FIXED
Firefox 33
People
(Reporter: dao, Assigned: trishul.goel, Mentored)
Details
(Whiteboard: [good first bug][lang=js])
Attachments
(1 file, 1 obsolete file)
|
10.37 KB,
patch
|
dao
:
review+
|
Details | Diff | Splinter Review |
"disableMCB" is a pretty cryptic name. We should rename this flag to something clearer like allowMixedContent.
Here's the code where this change needs to be made:
http://mxr.mozilla.org/mozilla-central/search?string=disableMCB
|
Reporter | |
Comment 2•12 years ago
|
||
Sure, go ahead!
Assignee: nobody → trishul.goel
Flags: needinfo?(dao)
Changed all the occurrences of disableMCB to allowMixedContent
15 matching lines in 5 files (as on MXR)
Attachment #8456974 -
Flags: review?(dao)
|
|
Reporter | |
Comment 4•12 years ago
|
||
Comment on attachment 8456974 [details] [diff] [review]
Renamig disableMCB to allowMixedContent
>--- a/browser/base/content/nsContextMenu.js
>+++ b/browser/base/content/nsContextMenu.js
>@@ -865,17 +865,17 @@ nsContextMenu.prototype = {
> persistDisableMCBInChildTab = true;
> }
> catch (e) { }
> }
>
> openLinkIn(this.linkURL, "tab",
> { charset: doc.characterSet,
> referrerURI: referrerURI,
>- disableMCB: persistDisableMCBInChildTab});
>+ allowMixedContent: persistDisableMCBInChildTab});
> },
Could you please rename the persistDisableMCBInChildTab variable too?
>--- a/browser/base/content/tabbrowser.xml
>+++ b/browser/base/content/tabbrowser.xml
>@@ -1279,46 +1279,46 @@
> <parameter name="aCharset"/>
> <parameter name="aPostData"/>
> <parameter name="aLoadInBackground"/>
> <parameter name="aAllowThirdPartyFixup"/>
> <body>
> <![CDATA[
> var aFromExternal;
> var aRelatedToCurrent;
>- var aDisableMCB;
>+ var aAllowMixedContent;
> var aSkipAnimation;
> if (arguments.length == 2 &&
> typeof arguments[1] == "object" &&
> !(arguments[1] instanceof Ci.nsIURI)) {
> let params = arguments[1];
> aReferrerURI = params.referrerURI;
> aCharset = params.charset;
> aPostData = params.postData;
> aLoadInBackground = params.inBackground;
> aAllowThirdPartyFixup = params.allowThirdPartyFixup;
> aFromExternal = params.fromExternal;
> aRelatedToCurrent = params.relatedToCurrent;
>- aDisableMCB = params.disableMCB;
>+ aAllowMixedContent = params.allowMixedContent;
please remove some spaces such that "=" lines up with the previous lines
> <parameter name="aOwner"/>
> <parameter name="aAllowThirdPartyFixup"/>
> <body>
> <![CDATA[
> const NS_XUL = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
> var aFromExternal;
> var aRelatedToCurrent;
> var aSkipAnimation;
>- var aDisableMCB;
>+ var aAllowMixedContent;
> if (arguments.length == 2 &&
> typeof arguments[1] == "object" &&
> !(arguments[1] instanceof Ci.nsIURI)) {
> let params = arguments[1];
> aReferrerURI = params.referrerURI;
> aCharset = params.charset;
> aPostData = params.postData;
> aOwner = params.ownerTab;
> aAllowThirdPartyFixup = params.allowThirdPartyFixup;
> aFromExternal = params.fromExternal;
> aRelatedToCurrent = params.relatedToCurrent;
> aSkipAnimation = params.skipAnimation;
>- aDisableMCB = params.disableMCB;
>+ aAllowMixedContent = params.allowMixedContent;
ditto
>@@ -1651,17 +1651,17 @@
>
> let flags = Ci.nsIWebNavigation.LOAD_FLAGS_NONE;
> if (aAllowThirdPartyFixup) {
> flags |= Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
> flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
> }
> if (aFromExternal)
> flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FROM_EXTERNAL;
>- if (aDisableMCB)
>+ if (aallowMixedContent)
this needs to be aAllowMixedContent
>--- a/browser/base/content/utilityOverlay.js
>+++ b/browser/base/content/utilityOverlay.js
>@@ -209,17 +209,17 @@ function openLinkIn(url, where, params)
> return;
>
> var aFromChrome = params.fromChrome;
> var aAllowThirdPartyFixup = params.allowThirdPartyFixup;
> var aPostData = params.postData;
> var aCharset = params.charset;
> var aReferrerURI = params.referrerURI;
> var aRelatedToCurrent = params.relatedToCurrent;
>- var aDisableMCB = params.disableMCB;
>+ var aAllowMixedContent = params.allowMixedContent;
please remove some spaces here as well
looks good otherwise!
removed spaces and renamed persistDisableMCBInChildTab
Attachment #8456974 -
Attachment is obsolete: true
Attachment #8456974 -
Flags: review?(dao)
Attachment #8457129 -
Flags: review?(dao)
|
|
Reporter | |
Comment 6•12 years ago
|
||
Comment on attachment 8457129 [details] [diff] [review]
Renamig disableMCB to allowMixedContent - revised
Thanks!
Attachment #8457129 -
Flags: review?(dao) → review+
|
|
Reporter | |
Comment 7•12 years ago
|
||
You are welcome.
So is there anything remaining to do in context of this bug
Flags: needinfo?(dao)
|
|
Reporter | |
Comment 9•12 years ago
|
||
Nothing left to do; your patch will automatically make its way to mozilla-central and then this bug will be resolved.
Flags: needinfo?(dao)
|
||
Comment 10•12 years ago
|
||
Status: NEW → RESOLVED
Closed: 12 years ago
Resolution: --- → FIXED
Target Milestone: --- → Firefox 33
You need to log in
before you can comment on or make changes to this bug.
Description
•