diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-06 00:48:16 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-06 00:48:16 +0100 |
| commit | 7c9b585349c985df0cf6ace83da5dadba8b5c677 (patch) | |
| tree | f22acdd5995354fa704855a57cc09d54392d902e /browser/base/content/browser.js | |
| parent | e8417003899a4ec9274815be30352c1328fc32e9 (diff) | |
| parent | a9b44dbcb33cd98b163f8a21223643f2cf3829cd (diff) | |
| download | UXP-7c9b585349c985df0cf6ace83da5dadba8b5c677.tar UXP-7c9b585349c985df0cf6ace83da5dadba8b5c677.tar.gz UXP-7c9b585349c985df0cf6ace83da5dadba8b5c677.tar.lz UXP-7c9b585349c985df0cf6ace83da5dadba8b5c677.tar.xz UXP-7c9b585349c985df0cf6ace83da5dadba8b5c677.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'browser/base/content/browser.js')
| -rwxr-xr-x | browser/base/content/browser.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 7aaaa09aa..5a54dcc58 100755 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -5688,7 +5688,7 @@ function middleMousePaste(event) { function stripUnsafeProtocolOnPaste(pasteData) { // Don't allow pasting javascript URIs since we don't support // LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL for those. - return pasteData.replace(/^(?:\s*javascript:)+/i, ""); + return pasteData.replace(/\r?\n/g, "").replace(/^(?:\s*javascript:)+/i, ""); } // handleDroppedLink has the following 2 overloads: |