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

Back out bug 1171979 due to bustage.

This commit is contained in:
Magnus Melin 2015-11-19 23:22:11 +02:00
Родитель bda6bbff35
Коммит 210a1475f2
20 изменённых файлов: 27 добавлений и 636 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
calendar/base/content/agenda-listbox.xml
Просмотреть файл

@ -169,7 +169,7 @@
</method>
</implementation>
<handlers>
<handler event="dragstart" phase="capturing"><![CDATA[
<handler event="draggesture" phase="capturing"><![CDATA[
invokeEventDragSession(this.mAllDayItem.occurrence.clone(), this);
event.stopPropagation();
event.preventDefault();
@ -281,7 +281,7 @@
</method>
</implementation>
<handlers>
<handler event="dragstart"><![CDATA[
<handler event="draggesture"><![CDATA[
invokeEventDragSession(this.mOccurrence.clone(), this);
]]></handler>
</handlers>

4
calendar/base/content/calendar-task-tree.xml
Просмотреть файл

@ -677,7 +677,7 @@
},
// Specifies if there is currently a sort on any column.
// Used mostly by drag'n'drop to affect drop feedback.
// Used mostly by dragdrop to affect drop feedback.
isSorted: function mTV_isSorted(aRow) {
return false;
},
@ -1132,7 +1132,7 @@
<handler event="mousedown"><![CDATA[
this.mTreeView.onMouseDown(event);
]]></handler>
<handler event="dragstart"><![CDATA[
<handler event="draggesture"><![CDATA[
if (event.originalTarget.localName != "treechildren") {
// We should only drag treechildren, not for example the scrollbar.
return;

2
calendar/base/content/calendar-view-core.xml
Просмотреть файл

@ -356,7 +356,7 @@
onMouseOverItem(event);
}
]]></handler>
<handler event="dragstart"><![CDATA[
<handler event="draggesture"><![CDATA[
if( event.target.localName == "calendar-event-box") {
return;
}

8
calendar/base/content/today-pane.xul
Просмотреть файл

@ -189,9 +189,9 @@
onfocus="agendaListbox.onFocus();"
onkeypress="agendaListbox.onKeyPress(event);"
ondblclick="agendaListbox.createNewEvent(event);"
ondragstart="nsDragAndDrop.startDrag(event, calendarCalendarButtonDNDObserver);"
ondraggesture="nsDragAndDrop.startDrag(event, calendarCalendarButtonDNDObserver);"
ondragover="nsDragAndDrop.dragOver(event, calendarCalendarButtonDNDObserver);"
ondrop="nsDragAndDrop.drop(event, calendarCalendarButtonDNDObserver);">
ondragdrop="nsDragAndDrop.drop(event, calendarCalendarButtonDNDObserver);">
<menupopup id="agenda-menupopup" onpopupshowing="return agendaListbox.setupContextMenu(event.target)">
<menuitem label="&calendar.context.modifyorviewitem.label;"
accesskey="&calendar.context.modifyorviewitem.accesskey;"
@ -282,9 +282,9 @@
collapsedinmodes="mail,task"
broadcaster="modeBroadcaster"
persist="height collapsedinmodes"
ondragstart="nsDragAndDrop.startDrag(event, calendarTaskButtonDNDObserver);"
ondraggesture="nsDragAndDrop.startDrag(event, calendarTaskButtonDNDObserver);"
ondragover="nsDragAndDrop.dragOver(event, calendarTaskButtonDNDObserver);"
ondrop="nsDragAndDrop.drop(event, calendarTaskButtonDNDObserver);"/>
ondragdrop="nsDragAndDrop.drop(event, calendarTaskButtonDNDObserver);"/>
</vbox>
</modevbox>

2
calendar/base/content/widgets/calendar-widgets.xml
Просмотреть файл

@ -659,7 +659,7 @@
}
]]></handler>
<handler event="drop"><![CDATA[
<handler event="dragdrop"><![CDATA[
let session = cal.getDragService().getCurrentSession();
if (!session || !session.sourceNode || !session.sourceNode.sourceObject) {
// No source node? Not our drag.

2
calendar/resources/content/calendarCreation.xul
Просмотреть файл

@ -61,7 +61,7 @@
<!-- Due to bug 128066, dropping urls here doesn't trigger
events. To work around, we use the dragexit handler,
which is triggered. Unfortunately, the more logical
choice of drag'n'drop doesn't work here either.-->
choice of dragdrop doesn't work here either.-->
<textbox id="calendar-uri"
required="true"
type="search"

2
mail/base/content/ABSearchDialog.xul
Просмотреть файл

@ -163,7 +163,7 @@
-->
</treecols>
<treechildren ondragstart="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
<treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
</tree>
</vbox>
<hbox align="start">

2
mail/base/content/SearchDialog.xul
Просмотреть файл

@ -178,7 +178,7 @@
<treecol id="idCol" persist="hidden ordinal width" flex="1" hidden="true"
label="&idColumn.label;" tooltiptext="&idColumn2.tooltip;"/>
</treecols>
<treechildren ondragstart="ThreadPaneOnDragStart(event);"/>
<treechildren ondraggesture="ThreadPaneOnDragStart(event);"/>
</tree>
</vbox>
<hbox align="start">

2
mail/base/content/messageWindow.xul
Просмотреть файл

@ -140,7 +140,7 @@
<hbox id="messagepaneboxwrapper" flex="1">
<vbox id="messagepanebox" flex="3"
ondragover="nsDragAndDrop.dragOver(event, messagepaneObserver);"
ondrop="nsDragAndDrop.drop(event, messagepaneObserver);"
ondragdrop="nsDragAndDrop.drop(event, messagepaneObserver);"
ondragexit="nsDragAndDrop.dragExit(event, messagepaneObserver);">
<hbox id="msgHeaderView"/>

4
mail/base/content/messenger.xul
Просмотреть файл

@ -336,7 +336,7 @@
keepcurrentinview="true"
context="folderPaneContext"
disableKeyNavigation="true"
ondragstart="gFolderTreeView._onDragStart(event);"
ondraggesture="gFolderTreeView._onDragStart(event);"
ondragover="gFolderTreeView._onDragOver(event);"
ondblclick="gFolderTreeView.onDoubleClick(event);"
onselect="FolderPaneSelectionChange();">
@ -493,7 +493,7 @@
<treecol id="idCol" persist="width" flex="1" hidden="true"
label="&idColumn.label;" tooltiptext="&idColumn2.tooltip;"/>
</treecols>
<treechildren ondragstart="ThreadPaneOnDragStart(event);"
<treechildren ondraggesture="ThreadPaneOnDragStart(event);"
ondragover="ThreadPaneOnDragOver(event);"
ondrop="ThreadPaneOnDrop(event);"/>
</tree>

4
mail/base/content/msgHdrViewOverlay.xul
Просмотреть файл

@ -574,7 +574,7 @@
<label id="attachmentName" crop="center" flex="1"
tooltiptext="&openAttachment.tooltip;"
onclick="OpenAttachmentFromBar(event);"
ondragstart="nsDragAndDrop.startDrag(event,attachmentNameDNDObserver);"/>
ondraggesture="nsDragAndDrop.startDrag(event,attachmentNameDNDObserver);"/>
<label id="attachmentSize"/>
</hbox>
<!-- Use a very large flex value here so that attachmentCount doesn't take
@ -659,7 +659,7 @@
<attachmentlist orient="horizontal" id="attachmentList" flex="1"
seltype="multiple" context="attachmentListContext"
itemcontext="attachmentItemContext"
ondragstart="nsDragAndDrop.startDrag(event,attachmentListDNDObserver);"
ondraggesture="nsDragAndDrop.startDrag(event,attachmentListDNDObserver);"
ondragover="nsDragAndDrop.dragOver(event, attachmentListDNDObserver);"/>
</vbox>

607
mail/base/content/nsDragAndDrop.js
Просмотреть файл

@ -1,607 +0,0 @@
// -*- indent-tabs-mode: nil; js-indent-level: 2 -*-
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
////////////////////////////////////////////////////////////////////////
//
// USE OF THIS API FOR DRAG AND DROP IS DEPRECATED!
// Do not use this file for new code.
//
// Toolkit dropped nsDragAndDrop.js in bug 1162050.
// Mapped to content/global/nsDragAndDrop.js until we can remove this usage.
//
// For documentation about what to use instead, see:
// http://developer.mozilla.org/En/DragDrop/Drag_and_Drop
//
////////////////////////////////////////////////////////////////////////
/**
* nsTransferable - a wrapper for nsITransferable that simplifies
* javascript clipboard and drag&drop. for use in
* these situations you should use the nsClipboard
* and nsDragAndDrop wrappers for more convenience
**/
var nsTransferable = {
/**
* nsITransferable set (TransferData aTransferData) ;
*
* Creates a transferable with data for a list of supported types ("flavours")
*
* @param TransferData aTransferData
* a javascript object in the format described above
**/
set: function (aTransferDataSet)
{
var trans = this.createTransferable();
for (var i = 0; i < aTransferDataSet.dataList.length; ++i)
{
var currData = aTransferDataSet.dataList[i];
var currFlavour = currData.flavour.contentType;
trans.addDataFlavor(currFlavour);
var supports = null; // nsISupports data
var length = 0;
if (currData.flavour.dataIIDKey == "nsISupportsString")
{
supports = Components.classes["@mozilla.org/supports-string;1"]
.createInstance(Components.interfaces.nsISupportsString);
supports.data = currData.supports;
length = supports.data.length;
}
else
{
// non-string data.
supports = currData.supports;
length = 0; // kFlavorHasDataProvider
}
trans.setTransferData(currFlavour, supports, length * 2);
}
return trans;
},
/**
* TransferData/TransferDataSet get (FlavourSet aFlavourSet,
* Function aRetrievalFunc, Boolean aAnyFlag) ;
*
* Retrieves data from the transferable provided in aRetrievalFunc, formatted
* for more convenient access.
*
* @param FlavourSet aFlavourSet
* a FlavourSet object that contains a list of supported flavours.
* @param Function aRetrievalFunc
* a reference to a function that returns a nsISupportsArray of nsITransferables
* for each item from the specified source (clipboard/drag&drop etc)
* @param Boolean aAnyFlag
* a flag specifying whether or not a specific flavour is requested. If false,
* data of the type of the first flavour in the flavourlist parameter is returned,
* otherwise the best flavour supported will be returned.
**/
get: function (aFlavourSet, aRetrievalFunc, aAnyFlag)
{
if (!aRetrievalFunc)
throw "No data retrieval handler provided!";
var supportsArray = aRetrievalFunc(aFlavourSet);
var dataArray = [];
var count = supportsArray.Count();
// Iterate over the number of items returned from aRetrievalFunc. For
// clipboard operations, this is 1, for drag and drop (where multiple
// items may have been dragged) this could be >1.
for (var i = 0; i < count; i++)
{
var trans = supportsArray.GetElementAt(i);
if (!trans) continue;
trans = trans.QueryInterface(Components.interfaces.nsITransferable);
var data = { };
var length = { };
var currData = null;
if (aAnyFlag)
{
var flavour = { };
trans.getAnyTransferData(flavour, data, length);
if (data && flavour)
{
var selectedFlavour = aFlavourSet.flavourTable[flavour.value];
if (selectedFlavour)
dataArray[i] = FlavourToXfer(data.value, length.value, selectedFlavour);
}
}
else
{
var firstFlavour = aFlavourSet.flavours[0];
trans.getTransferData(firstFlavour, data, length);
if (data && firstFlavour)
dataArray[i] = FlavourToXfer(data.value, length.value, firstFlavour);
}
}
return new TransferDataSet(dataArray);
},
/**
* nsITransferable createTransferable (void) ;
*
* Creates and returns a transferable object.
**/
createTransferable: function ()
{
const kXferableContractID = "@mozilla.org/widget/transferable;1";
const kXferableIID = Components.interfaces.nsITransferable;
var trans = Components.classes[kXferableContractID].createInstance(kXferableIID);
trans.init(null);
return trans;
}
};
/**
* A FlavourSet is a simple type that represents a collection of Flavour objects.
* FlavourSet is constructed from an array of Flavours, and stores this list as
* an array and a hashtable. The rationale for the dual storage is as follows:
*
* Array: Ordering is important when adding data flavours to a transferable.
* Flavours added first are deemed to be 'preferred' by the client.
* Hash: Convenient lookup of flavour data using the content type (MIME type)
* of data as a key.
*/
function FlavourSet(aFlavourList)
{
this.flavours = aFlavourList || [];
this.flavourTable = { };
this._XferID = "FlavourSet";
for (var i = 0; i < this.flavours.length; ++i)
this.flavourTable[this.flavours[i].contentType] = this.flavours[i];
}
FlavourSet.prototype = {
appendFlavour: function (aFlavour, aFlavourIIDKey)
{
var flavour = new Flavour (aFlavour, aFlavourIIDKey);
this.flavours.push(flavour);
this.flavourTable[flavour.contentType] = flavour;
}
};
/**
* A Flavour is a simple type that represents a data type that can be handled.
* It takes a content type (MIME type) which is used when storing data on the
* system clipboard/drag and drop, and an IIDKey (string interface name
* which is used to QI data to an appropriate form. The default interface is
* assumed to be wide-string.
*/
function Flavour(aContentType, aDataIIDKey)
{
this.contentType = aContentType;
this.dataIIDKey = aDataIIDKey || "nsISupportsString";
this._XferID = "Flavour";
}
function TransferDataBase() {}
TransferDataBase.prototype = {
push: function (aItems)
{
this.dataList.push(aItems);
},
get first ()
{
return "dataList" in this && this.dataList.length ? this.dataList[0] : null;
}
};
/**
* TransferDataSet is a list (array) of TransferData objects, which represents
* data dragged from one or more elements.
*/
function TransferDataSet(aTransferDataList)
{
this.dataList = aTransferDataList || [];
this._XferID = "TransferDataSet";
}
TransferDataSet.prototype = TransferDataBase.prototype;
/**
* TransferData is a list (array) of FlavourData for all the applicable content
* types associated with a drag from a single item.
*/
function TransferData(aFlavourDataList)
{
this.dataList = aFlavourDataList || [];
this._XferID = "TransferData";
}
TransferData.prototype = {
__proto__: TransferDataBase.prototype,
addDataForFlavour: function (aFlavourString, aData, aLength, aDataIIDKey)
{
this.dataList.push(new FlavourData(aData, aLength,
new Flavour(aFlavourString, aDataIIDKey)));
}
};
/**
* FlavourData is a type that represents data retrieved from the system
* clipboard or drag and drop. It is constructed internally by the Transferable
* using the raw (nsISupports) data from the clipboard, the length of the data,
* and an object of type Flavour representing the type. Clients implementing
* IDragDropObserver receive an object of this type in their implementation of
* onDrop. They access the 'data' property to retrieve data, which is either data
* QI'ed to a usable form, or unicode string.
*/
function FlavourData(aData, aLength, aFlavour)
{
this.supports = aData;
this.contentLength = aLength;
this.flavour = aFlavour || null;
this._XferID = "FlavourData";
}
FlavourData.prototype = {
get data ()
{
if (this.flavour &&
this.flavour.dataIIDKey != "nsISupportsString")
return this.supports.QueryInterface(Components.interfaces[this.flavour.dataIIDKey]);
var supports = this.supports;
if (supports instanceof Components.interfaces.nsISupportsString)
return supports.data.substring(0, this.contentLength/2);
return supports;
}
}
/**
* Create a TransferData object with a single FlavourData entry. Used when
* unwrapping data of a specific flavour from the drag service.
*/
function FlavourToXfer(aData, aLength, aFlavour)
{
return new TransferData([new FlavourData(aData, aLength, aFlavour)]);
}
var transferUtils = {
retrieveURLFromData: function (aData, flavour)
{
switch (flavour) {
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":
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
var fileHandler = ioService.getProtocolHandler("file")
.QueryInterface(Components.interfaces.nsIFileProtocolHandler);
return fileHandler.getURLSpecFromFile(aData);
}
return null;
}
}
/**
* nsDragAndDrop - a convenience wrapper for nsTransferable, nsITransferable
* and nsIDragService/nsIDragSession.
*
* Use: map the handler functions to the 'ondraggesture', 'ondragover' and
* 'ondragdrop' event handlers on your XML element, e.g.
* <xmlelement ondraggesture="nsDragAndDrop.startDrag(event, observer);"
* ondragover="nsDragAndDrop.dragOver(event, observer);"
* ondragdrop="nsDragAndDrop.drop(event, observer);"/>
*
* You need to create an observer js object with the following member
* functions:
* Object onDragStart (event) // called when drag initiated,
* // returns flavour list with data
* // to stuff into transferable
* void onDragOver (Object flavour) // called when element is dragged
* // over, so that it can perform
* // any drag-over feedback for provided
* // flavour
* void onDrop (Object data) // formatted data object dropped.
* Object getSupportedFlavours () // returns a flavour list so that
* // nsTransferable can determine
* // whether or not to accept drop.
**/
var nsDragAndDrop = {
_mDS: null,
get mDragService()
{
if (!this._mDS)
{
const kDSContractID = "@mozilla.org/widget/dragservice;1";
const kDSIID = Components.interfaces.nsIDragService;
this._mDS = Components.classes[kDSContractID].getService(kDSIID);
}
return this._mDS;
},
/**
* void startDrag (DOMEvent aEvent, Object aDragDropObserver) ;
*
* called when a drag on an element is started.
*
* @param DOMEvent aEvent
* the DOM event fired by the drag init
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
**/
startDrag: function (aEvent, aDragDropObserver)
{
if (!("onDragStart" in aDragDropObserver))
return;
const kDSIID = Components.interfaces.nsIDragService;
var dragAction = { action: kDSIID.DRAGDROP_ACTION_COPY + kDSIID.DRAGDROP_ACTION_MOVE + kDSIID.DRAGDROP_ACTION_LINK };
var transferData = { data: null };
try
{
aDragDropObserver.onDragStart(aEvent, transferData, dragAction);
}
catch (e)
{
return; // not a draggable item, bail!
}
if (!transferData.data) return;
transferData = transferData.data;
var dt = aEvent.dataTransfer;
var count = 0;
do {
var tds = transferData._XferID == "TransferData"
? transferData
: transferData.dataList[count]
for (var i = 0; i < tds.dataList.length; ++i)
{
var currData = tds.dataList[i];
var currFlavour = currData.flavour.contentType;
var value = currData.supports;
if (value instanceof Components.interfaces.nsISupportsString)
value = value.toString();
dt.mozSetDataAt(currFlavour, value, count);
}
count++;
}
while (transferData._XferID == "TransferDataSet" &&
count < transferData.dataList.length);
dt.effectAllowed = "all";
// a drag targeted at a tree should instead use the treechildren so that
// the current selection is used as the drag feedback
dt.addElement(aEvent.originalTarget.localName == "treechildren" ?
aEvent.originalTarget : aEvent.target);
aEvent.stopPropagation();
},
/**
* void dragOver (DOMEvent aEvent, Object aDragDropObserver) ;
*
* called when a drag passes over this element
*
* @param DOMEvent aEvent
* the DOM event fired by passing over the element
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
**/
dragOver: function (aEvent, aDragDropObserver)
{
if (!("onDragOver" in aDragDropObserver))
return;
if (!this.checkCanDrop(aEvent, aDragDropObserver))
return;
var flavourSet = aDragDropObserver.getSupportedFlavours();
for (var flavour in flavourSet.flavourTable)
{
if (this.mDragSession.isDataFlavorSupported(flavour))
{
aDragDropObserver.onDragOver(aEvent,
flavourSet.flavourTable[flavour],
this.mDragSession);
aEvent.stopPropagation();
aEvent.preventDefault();
break;
}
}
},
mDragSession: null,
/**
* void drop (DOMEvent aEvent, Object aDragDropObserver) ;
*
* called when the user drops on the element
*
* @param DOMEvent aEvent
* the DOM event fired by the drop
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
**/
drop: function (aEvent, aDragDropObserver)
{
if (!("onDrop" in aDragDropObserver))
return;
if (!this.checkCanDrop(aEvent, aDragDropObserver))
return;
var flavourSet = aDragDropObserver.getSupportedFlavours();
var dt = aEvent.dataTransfer;
var dataArray = [];
var count = dt.mozItemCount;
for (var i = 0; i < count; ++i) {
var types = dt.mozTypesAt(i);
for (var j = 0; j < flavourSet.flavours.length; j++) {
var type = flavourSet.flavours[j].contentType;
// dataTransfer uses text/plain but older code used text/unicode, so
// switch this for compatibility
var modtype = (type == "text/unicode") ? "text/plain" : type;
if (Array.indexOf(types, modtype) >= 0) {
var data = dt.mozGetDataAt(modtype, i);
if (data) {
// Non-strings need some non-zero value used for their data length.
const kNonStringDataLength = 4;
var length = (typeof data == "string") ? data.length : kNonStringDataLength;
dataArray[i] = FlavourToXfer(data, length, flavourSet.flavourTable[type]);
break;
}
}
}
}
var transferData = new TransferDataSet(dataArray)
// hand over to the client to respond to dropped data
var multiple = "canHandleMultipleItems" in aDragDropObserver && aDragDropObserver.canHandleMultipleItems;
var dropData = multiple ? transferData : transferData.first.first;
aDragDropObserver.onDrop(aEvent, dropData, this.mDragSession);
aEvent.stopPropagation();
},
/**
* void dragExit (DOMEvent aEvent, Object aDragDropObserver) ;
*
* called when a drag leaves this element
*
* @param DOMEvent aEvent
* the DOM event fired by leaving the element
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
**/
dragExit: function (aEvent, aDragDropObserver)
{
if (!this.checkCanDrop(aEvent, aDragDropObserver))
return;
if ("onDragExit" in aDragDropObserver)
aDragDropObserver.onDragExit(aEvent, this.mDragSession);
},
/**
* void dragEnter (DOMEvent aEvent, Object aDragDropObserver) ;
*
* called when a drag enters in this element
*
* @param DOMEvent aEvent
* the DOM event fired by entering in the element
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
**/
dragEnter: function (aEvent, aDragDropObserver)
{
if (!this.checkCanDrop(aEvent, aDragDropObserver))
return;
if ("onDragEnter" in aDragDropObserver)
aDragDropObserver.onDragEnter(aEvent, this.mDragSession);
},
/**
* Boolean checkCanDrop (DOMEvent aEvent, Object aDragDropObserver) ;
*
* Sets the canDrop attribute for the drag session.
* returns false if there is no current drag session.
*
* @param DOMEvent aEvent
* the DOM event fired by the drop
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
**/
checkCanDrop: function (aEvent, aDragDropObserver)
{
if (!this.mDragSession)
this.mDragSession = this.mDragService.getCurrentSession();
if (!this.mDragSession)
return false;
this.mDragSession.canDrop = this.mDragSession.sourceNode != aEvent.target;
if ("canDrop" in aDragDropObserver)
this.mDragSession.canDrop &= aDragDropObserver.canDrop(aEvent, this.mDragSession);
return true;
},
/**
* Do a security check for drag n' drop. Make sure the source document
* can load the dragged link.
*
* @param DOMEvent aEvent
* the DOM event fired by leaving the element
* @param Object aDragDropObserver
* javascript object of format described above that specifies
* the way in which the element responds to drag events.
* @param String aDraggedText
* the text being dragged
**/
dragDropSecurityCheck: function (aEvent, aDragSession, aDraggedText)
{
// Strip leading and trailing whitespace, then try to create a
// URI from the dropped string. If that succeeds, we're
// dropping a URI and we need to do a security check to make
// sure the source document can load the dropped URI. We don't
// so much care about creating the real URI here
// (i.e. encoding differences etc don't matter), we just want
// to know if aDraggedText really is a URI.
aDraggedText = aDraggedText.replace(/^\s*|\s*$/g, '');
var uri;
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
.getService(Components.interfaces.nsIIOService);
try {
uri = ioService.newURI(aDraggedText, null, null);
} catch (e) {
}
if (!uri)
return;
// aDraggedText is a URI, do the security check.
const nsIScriptSecurityManager = Components.interfaces
.nsIScriptSecurityManager;
var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
.getService(nsIScriptSecurityManager);
if (!aDragSession)
aDragSession = this.mDragService.getCurrentSession();
var sourceDoc = aDragSession.sourceDocument;
// Use "file:///" as the default sourceURI so that drops of file:// URIs
// are always allowed.
var principal = sourceDoc ? sourceDoc.nodePrincipal
: secMan.getSimpleCodebasePrincipal(ioService.newURI("file:///", null, null));
try {
secMan.checkLoadURIStrWithPrincipal(principal, aDraggedText,
nsIScriptSecurityManager.STANDARD);
} catch (e) {
// Stop event propagation right here.
aEvent.stopPropagation();
throw "Drop of " + aDraggedText + " denied.";
}
}
};

2
mail/base/jar.mn
Просмотреть файл

@ -122,7 +122,5 @@ comm.jar:
content/communicator/utilityOverlay.js (content/utilityOverlay.js)
toolkit.jar:
# toolkit dropped nsDragAndDrop.js in bug 1162050. ship a copy until we can remove it.
content/global/nsDragAndDrop.js (content/nsDragAndDrop.js)
% overlay chrome://global/content/customizeToolbar.xul chrome://messenger/content/customizeToolbarOverlay.xul
% overlay chrome://mozapps/content/downloads/downloads.xul chrome://messenger/content/downloadsOverlay.xul

2
mail/components/addrbook/content/abContactsPanel.xul
Просмотреть файл

@ -106,7 +106,7 @@
persist="hidden ordinal width sortDirection" hidden="true"
flex="1" label="&PrimaryEmail.label;"/>
</treecols>
<treechildren ondragstart="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
<treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
</tree>
<separator class="thin"/>

2
mail/components/addrbook/content/abEditListDialog.xul
Просмотреть файл

@ -14,7 +14,7 @@
onload="OnLoadEditList();"
ondialogaccept="return EditListOKButton();"
ondragover="DragOverAddressListTree(event);"
ondrop="DropOnAddressListTree(event);">
ondragdrop="DropOnAddressListTree(event);">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>

2
mail/components/addrbook/content/abMailListDialog.xul
Просмотреть файл

@ -14,7 +14,7 @@
ondialogaccept="return MailListOKButton();"
onload="OnLoadNewMailList();"
ondragover="DragOverAddressListTree(event);"
ondrop="DropOnAddressListTree(event);">
ondragdrop="DropOnAddressListTree(event);">
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>

2
mail/components/addrbook/content/addressbook.xul
Просмотреть файл

@ -729,7 +729,7 @@
-->
</treecols>
<treechildren ondragstart="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
<treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
</tree>
<splitter id="results-splitter" collapse="after" persist="state"/>

6
mail/components/compose/content/messengercompose.xul
Просмотреть файл

@ -749,7 +749,7 @@
tooltiptext="&attachButton.tooltip;"
command="cmd_attachFile"
ondragover="nsDragAndDrop.dragOver(event, envelopeDragObserver);"
ondrop="nsDragAndDrop.drop(event, envelopeDragObserver);"
ondragdrop="nsDragAndDrop.drop(event, envelopeDragObserver);"
ondragexit="nsDragAndDrop.dragExit(event, envelopeDragObserver);">
<menupopup id="button-attachPopup" onpopupshowing="updateAttachmentItems();">
<menuitem id="button-attachPopup_attachFileItem"
@ -905,7 +905,7 @@
<toolbar id="MsgHeadersToolbar" persist="collapsed" flex="1"
customizable="true" nowindowdrag="true"
ondragover="nsDragAndDrop.dragOver(event, envelopeDragObserver);"
ondrop="nsDragAndDrop.drop(event, envelopeDragObserver);"
ondragdrop="nsDragAndDrop.drop(event, envelopeDragObserver);"
ondragexit="nsDragAndDrop.dragExit(event, envelopeDragObserver);">
<hbox id="msgheaderstoolbar-box" flex="1">
<vbox flex="1" id="addresses-box">
@ -985,7 +985,7 @@
itemcontext="msgComposeAttachmentItemContext"
onclick="AttachmentBucketClicked(event);"
onselect="updateAttachmentItems();"
ondragstart="nsDragAndDrop.startDrag(event, attachmentBucketDNDObserver);"/>
ondraggesture="nsDragAndDrop.startDrag(event, attachmentBucketDNDObserver);"/>
</vbox>
</hbox>
</toolbar>

2
mail/components/im/content/imAccounts.xul
Просмотреть файл

@ -145,7 +145,7 @@
ondragstart="nsDragAndDrop.startDrag(event, gAMDragAndDrop);"
ondragover="nsDragAndDrop.dragOver(event, gAMDragAndDrop);"
ondragend="gAMDragAndDrop.cleanBorders(true);"
ondrop="nsDragAndDrop.drop(event, gAMDragAndDrop);"/>
ondragdrop="nsDragAndDrop.drop(event, gAMDragAndDrop);"/>
</notificationbox>
</deck>
<windowdragbox id="bottombuttons" align="center">

2
mailnews/addrbook/content/abResultsPaneOverlay.xul
Просмотреть файл

@ -85,7 +85,7 @@
-->
</treecols>
<treechildren ondragstart="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
<treechildren ondraggesture="nsDragAndDrop.startDrag(event, abResultsPaneObserver);"/>
</tree>
</overlay>