mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

405482 - "'Restore Default Set' breaks Location Bar's drag and drop replace text and auto-submit feature" [p=dao@mozilla.com (D��o Gottwald) r=gavin a1.9=beltzner]

This commit is contained in:
reed%reedloden.com 2007-11-28 22:36:24 +00:00
Родитель dfba2a1f67
Коммит 64a1b043cb
2 изменённых файлов: 47 добавлений и 54 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

54
browser/base/content/browser.js
Просмотреть файл

@ -890,11 +890,6 @@ function delayedStartup()
gURLBar.setAttribute("enablehistory", "false");
}
if (gURLBar) {
gURLBar.addEventListener("dragover", URLBarOnDragOver, true);
gURLBar.addEventListener("dragdrop", URLBarOnDrop, true);
}
gBrowser.addEventListener("pageshow", function(evt) { setTimeout(pageShowEventHandlers, 0, evt); }, true);
window.addEventListener("keypress", ctrlNumberTabSelection, false);
@ -2108,55 +2103,6 @@ function URLBarOnInput(evt)
ih._identityPopup.hidePopup();
}
function URLBarOnDragOver(evt)
{
nsDragAndDrop.dragOver(evt, urlbarObserver);
}
function URLBarOnDrop(evt)
{
nsDragAndDrop.drop(evt, urlbarObserver);
}
var urlbarObserver = {
onDragOver: function ()
{
return true;
},
onDrop: function (aEvent, aXferData, aDragSession)
{
var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType);
// The URL bar automatically handles inputs with newline characters,
// so we can get away with treating text/x-moz-url flavours as text/unicode.
if (url) {
nsDragAndDrop.dragDropSecurityCheck(aEvent, aDragSession, url);
try {
gURLBar.value = url;
const nsIScriptSecMan = Components.interfaces.nsIScriptSecurityManager;
urlSecurityCheck(gURLBar.value,
gBrowser.contentPrincipal,
nsIScriptSecMan.DISALLOW_INHERIT_PRINCIPAL);
handleURLBarCommand();
} catch (ex) {}
}
},
getSupportedFlavours: function ()
{
var flavourSet = new FlavourSet();
// Favor text/x-moz-url since text/unicode coming from Win32 1.8 branch
// drops contains URL\ntext. The previous comment here said that
// plain text drops often come with text/x-moz-url flavor, but I
// haven't seen that, so hopefully that behavior has changed.
flavourSet.appendFlavour("text/x-moz-url");
flavourSet.appendFlavour("text/unicode");
flavourSet.appendFlavour("application/x-moz-file", "nsIFile");
return flavourSet;
}
}
function BrowserImport()
{
#ifdef XP_MACOSX

47
browser/base/content/urlbarBindings.xml
Просмотреть файл

@ -128,6 +128,51 @@
]]></body>
</method>
<method name="onDragOver">
<body>
return true;
</body>
</method>
<method name="onDrop">
<parameter name="aEvent"/>
<parameter name="aXferData"/>
<parameter name="aDragSession"/>
<body><![CDATA[
var url = transferUtils.retrieveURLFromData(aXferData.data, aXferData.flavour.contentType);
// The URL bar automatically handles inputs with newline characters,
// so we can get away with treating text/x-moz-url flavours as text/unicode.
if (url) {
nsDragAndDrop.dragDropSecurityCheck(aEvent, aDragSession, url);
try {
gURLBar.value = url;
const nsIScriptSecMan = Components.interfaces.nsIScriptSecurityManager;
urlSecurityCheck(gURLBar.value,
gBrowser.contentPrincipal,
nsIScriptSecMan.DISALLOW_INHERIT_PRINCIPAL);
handleURLBarCommand();
} catch (ex) {}
}
]]></body>
</method>
<method name="getSupportedFlavours">
<body><![CDATA[
var flavourSet = new FlavourSet();
// Favor text/x-moz-url since text/unicode coming from Win32 1.8 branch
// drops contains URL\ntext. The previous comment here said that
// plain text drops often come with text/x-moz-url flavor, but I
// haven't seen that, so hopefully that behavior has changed.
flavourSet.appendFlavour("text/x-moz-url");
flavourSet.appendFlavour("text/unicode");
flavourSet.appendFlavour("application/x-moz-file", "nsIFile");
return flavourSet;
]]></body>
</method>
<field name="_copyCutController"><![CDATA[
({
urlbar: this,
@ -215,6 +260,8 @@
<handlers>
<handler event="focus" phase="capturing" action="this._hideURLTooltip();"/>
<handler event="dragover" phase="capturing" action="nsDragAndDrop.dragOver(event, this);"/>
<handler event="dragdrop" phase="capturing" action="nsDragAndDrop.drop(event, this);"/>
</handlers>
</binding>