Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

back out my dumb-ass fix for 52519 - it only worked for like a day, then died.

Browse Source
This commit is contained in:
alecf%netscape.com 2000-11-03 02:58:58 +00:00
parent 1e017af7ab
commit c3160b6c5c
3 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xpfe/browser/resources/content/navigatorDD.js
View File

@ -101,7 +101,7 @@ var personalToolbarObserver = {
var flavourList = { };
flavourList["moz/toolbaritem"] = { width: 2, data: uri };
flavourList["text/x-moz-url"] = { width: 2, data: escape(uri) + " " + "[ TEMP TITLE ]" };
flavourList["text/x-moz-url"] = { width: 2, data: uri + " " + "[ TEMP TITLE ]" };
flavourList["text/html"] = { width: 2, data: htmlString };
flavourList["text/unicode"] = { width: 2, data: uri };
return flavourList;
@ -288,7 +288,7 @@ var contentAreaDNDObserver = {
}
else
{
dump("dragging DOM node: <" + aEvent.target.localName + ">\n");
dump("didnt get here\n");
switch (aEvent.target.localName)
{
case 'AREA':
@ -355,11 +355,11 @@ var contentAreaDNDObserver = {
break;
}
}
var flavourList = { };
flavourList["text/html"] = { width: 2, data: htmlstring };
if (isLink)
flavourList["text/x-moz-url"] = { width: 2, data: escape(textstring) + " " + "( TEMP TITLE )" };
if (isLink)
flavourList["text/x-moz-url"] = { width: 2, data: textstring + " " + "( TEMP TITLE )" };
flavourList["text/unicode"] = { width: 2, data: textstring };
return flavourList;
},
@ -380,10 +380,7 @@ var contentAreaDNDObserver = {
var url = retrieveURLFromData(data);
if (url.length == 0)
return;
// this is a hacky fix for #40911 so that dragging
// and dropping text from the same window into itself
// does not load that text as a URL.
// see bug #52519 for related problems with this fix
// valid urls don't contain spaces ' '; if we have a space it isn't a valid url so bail out
var urlstr = url.toString();
if ( urlstr.indexOf(" ", 0) != -1 )
return;
@ -436,7 +433,7 @@ var proxyIconDNDObserver = {
var urlBar = document.getElementById("urlbar");
var flavourList = { };
flavourList["text/unicode"] = { width: 2, data: urlBar.value };
flavourList["text/x-moz-url"] = { width: 2, data: escape(urlBar.value) + " " + window.title };
flavourList["text/x-moz-url"] = { width: 2, data: urlBar.value + " " + window._content.document.title };
var htmlString = "<a href=\"" + urlBar.value + "\">" + urlBar.value + "</a>";
flavourList["text/html"] = { width: 2, data: htmlString };
return flavourList;
@ -475,7 +472,7 @@ var homeButtonObserver = {
setHomepage = true;
if (setHomepage)
{
nsPreferences.setUnicharPref("browser.startup.homepage", url);
nsPreferences.setUnicharPref("browser.startup.homepage", url);
setTooltipText("homebutton", url);
}
},
@ -502,7 +499,7 @@ var homeButtonObserver = {
{
var homepage = nsPreferences.getLocalizedUnicharPref("browser.startup.homepage", "about:blank");
var flavourList = { };
flavourList["text/x-moz-url"] = { width: 2, data: escape(homepage) + " " + "[ TEMP - Home Page ]" };
flavourList["text/x-moz-url"] = { width: 2, data: homepage + " " + "[ TEMP - Home Page ]" };
flavourList["text/html"] = { width: 2, data: htmlString };
flavourList["text/unicode"] = { width: 2, data: homepage };
var htmlString = "<a href=\"" + homepage + "\">" + homepage + "</a>";
@ -524,9 +521,8 @@ function retrieveURLFromData (aData)
switch (aData.flavour)
{
case "text/unicode":
return aData.data.data; // XXX this is busted.
case "text/x-moz-url":
return unescape(aData.data.data); // XXX this is busted.
return aData.data.data; // XXX this is busted.
break;
case "application/x-moz-file":
var dataObj = aData.data.data.QueryInterface(Components.interfaces.nsIFile);

16
xpfe/components/bookmarks/resources/bookmarksDD.js
View File

@ -325,15 +325,6 @@ function DropOnTree ( event )
// we may need to synthesize a name (just use the URL)
checkNameHack = true;
// pull the (optional) name out of the URL
var space = sourceID.indexOf(" ");
if (space >= 0)
{
name = sourceID.substr(space+1);
sourceID = sourceID.substr(0, space);
sourceID = unescape(sourceID);
}
}
else if (bestFlavor.value == "text/unicode")
{
@ -348,6 +339,13 @@ function DropOnTree ( event )
continue;
}
// pull the (optional) name out of the URL
var space = sourceID.indexOf(" ");
if (space >= 0)
{
name = sourceID.substr(space+1);
sourceID = sourceID.substr(0, space);
}
dump(" Node #" + i + ": drop '" + sourceID + "'\n");
dump(" from container '" + parentID + "'\n");

4
xpfe/components/history/resources/history.js
View File

@ -95,8 +95,8 @@ var historyDNDObserver = {
var flavourList = { };
flavourList["text/unicode"] = { width: 2, data: uri };
flavourList["text/html"] = { width: 2, data: htmlString };
flavourList["text/x-moz-url"] = { width: 2, data: escape(uri) + " " + title };
flavourList["text/x-moz-url"] = { width: 2, data: uri + " " + title };
return flavourList;
},
};
};