stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nsDragAndDrop.jsがTrunkで使用されなくなってtransferUtils.retrieveURLFromData()が使えなくなったので、同等の機能を自前で持つようにした

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@6677 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2010-06-13 12:46:43 +00:00
parent e1ebe3411e
commit 496757fd9c
1 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
content/treestyletab/treestyletab.js
View File

@ -737,7 +737,8 @@ catch(e) {
sv.clearDropPosition(); sv.clearDropPosition();
var dropActionInfo = sv.getDropAction(aEvent, sv.getCurrentDragSession()); var session = sv.getCurrentDragSession();
var dropActionInfo = sv.getDropAction(aEvent, session);
var draggedTab; var draggedTab;
if (dt.dropEffect != 'link') { if (dt.dropEffect != 'link') {
@ -778,12 +779,13 @@ catch(e) {
aEvent.stopPropagation(); aEvent.stopPropagation();
let url; let url;
for (let i = 0; i < tabbar._supportedLinkDropTypes.length; i++) { let types = ['text/x-moz-url', 'text/uri-list', 'text/plain', 'application/x-moz-file'];
let dataType = tabbar._supportedLinkDropTypes[i]; for (let i = 0; i < types.length; i++) {
let dataType = types[i];
let isURLList = dataType == 'text/uri-list'; let isURLList = dataType == 'text/uri-list';
let urlData = dt.mozGetDataAt(isURLList ? 'URL' : dataType , 0); let urlData = dt.mozGetDataAt(isURLList ? 'URL' : dataType , 0);
if (urlData) { if (urlData) {
url = transferUtils.retrieveURLFromData(urlData, isURLList ? 'text/plain' : dataType); url = this.retrieveURLFromData(urlData, isURLList ? 'text/plain' : dataType);
break; break;
} }
} }
@ -791,7 +793,22 @@ catch(e) {
if (!url || !url.length || url.indexOf(' ', 0) != -1 || /^\s*(javascript|data):/.test(url)) if (!url || !url.length || url.indexOf(' ', 0) != -1 || /^\s*(javascript|data):/.test(url))
return; return;
nsDragAndDrop.dragDropSecurityCheck(aEvent, sv.getCurrentDragSession(), url); let (sourceDoc = session ? session.sourceDocument : null) {
if (sourceDoc &&
sourceDoc.documentURI.indexOf('chrome://') < 0) {
let sourceURI = sourceDoc.documentURI;
let nsIScriptSecurityManager = Components.interfaces.nsIScriptSecurityManager;
let secMan = Components.classes['@mozilla.org/scriptsecuritymanager;1']
.getService(nsIScriptSecurityManager);
try {
secMan.checkLoadURIStr(sourceDoc.documentURI, url, nsIScriptSecurityManager.STANDARD);
}
catch(e) {
aEvent.stopPropagation();
throw 'Drop of ' + url + ' denied.';
}
}
}
let bgLoad = this.getPref('browser.tabs.loadInBackground'); let bgLoad = this.getPref('browser.tabs.loadInBackground');
if (aEvent.shiftKey) bgLoad = !bgLoad; if (aEvent.shiftKey) bgLoad = !bgLoad;
@ -825,6 +842,26 @@ catch(e) {
} }
} }
}, },
retrieveURLFromData: function TSTService_retrieveURLFromData(aData, aType)
{
switch (aType)
{
case 'text/unicode':
case 'text/plain':
case 'text/x-moz-text-internal':
return aData.replace(/^\s+|\s+$/g, '');
case 'text/x-moz-url':
return ((aData instanceof Components.interfaces.nsISupportsString) ? aData.toString() : aData)
.split('\n')[0];
case 'application/x-moz-file':
let fileHandler = this.IOService.getProtocolHandler('file')
.QueryInterface(Components.interfaces.nsIFileProtocolHandler);
return fileHandler.getURLSpecFromFile(aData);
}
return null;
},
onTabDragEnd : function TSTService_onTabDragEnd(aEvent) onTabDragEnd : function TSTService_onTabDragEnd(aEvent)
{ {