diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul index 042d981f099d..c314adbe27b9 100644 --- a/calendar/resources/content/calendar.xul +++ b/calendar/resources/content/calendar.xul @@ -497,12 +497,17 @@ + + + diff --git a/calendar/resources/content/dayView.js b/calendar/resources/content/dayView.js index 4556a0eff385..01c82d193907 100644 --- a/calendar/resources/content/dayView.js +++ b/calendar/resources/content/dayView.js @@ -479,9 +479,6 @@ DayView.prototype.createEventBoxInternal = function(event) eventBox.setAttribute( "ondblclick", "dayEventItemDoubleClick( this, event )" ); eventBox.setAttribute( "onmouseover", "onMouseOverGridOccurrence(event)" ); eventBox.setAttribute( "tooltip", "gridOccurrenceTooltip" ); - eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);" ); - eventBox.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)" ); - eventBox.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,calendarViewDNDObserver)" ); // mark the box as selected, if the event is if (this.calendarWindow.EventSelection.isSelectedEvent(calEvent)) diff --git a/calendar/resources/content/monthView.js b/calendar/resources/content/monthView.js index 40863283685e..a435dc334d1a 100644 --- a/calendar/resources/content/monthView.js +++ b/calendar/resources/content/monthView.js @@ -194,10 +194,6 @@ function MonthView( calendarWindow ) dayBoxItem.setAttribute( "onclick", "gCalendarWindow.monthView.clickDay( event )" ); dayBoxItem.setAttribute( "oncontextmenu", "gCalendarWindow.monthView.contextClickDay( event )" ); - - //set the drop - dayBoxItem.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,monthViewEventDragAndDropObserver)" ); - dayBoxItem.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,monthViewEventDragAndDropObserver)" ); //set the double click of day boxes dayBoxItem.setAttribute( "ondblclick", "gCalendarWindow.monthView.doubleClickDay( event )" ); @@ -285,7 +281,6 @@ MonthView.prototype.createEventDotInternal = function(itemOccurrence, startDate, eventDot.setAttribute("ondblclick", "monthEventBoxDoubleClickEvent( this, event )" ); eventDot.setAttribute("onmouseover", "onMouseOverGridOccurrence(event)" ); eventDot.setAttribute("tooltip", "gridOccurrenceTooltip" ); - eventDot.setAttribute("ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); eventDot.occurrence = itemOccurrence; // for mouseover preview eventDot.event = calEvent; eventDotBox.appendChild( eventDot ); @@ -350,7 +345,6 @@ MonthView.prototype.createEventBoxInternal = function(itemOccurrence, startDate, eventBox.setAttribute("ondblclick", "monthEventBoxDoubleClickEvent( this, event )" ); eventBox.setAttribute("onmouseover", "onMouseOverGridOccurrence(event)" ); eventBox.setAttribute("tooltip", "gridOccurrenceTooltip" ); - eventBox.setAttribute("ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); // add a property to the event box that holds the calendarEvent that the // box represents @@ -381,7 +375,6 @@ MonthView.prototype.createEventBoxInternal = function(itemOccurrence, startDate, eventBox.setAttribute( "eventselected", "true" ); eventBoxText.setAttribute("flex", "1"); - eventBoxText.setAttribute("ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);"); // add the text to the event box and the event box to the day box @@ -451,7 +444,6 @@ MonthView.prototype.createEventBoxInternal = function(itemOccurrence, startDate, eventBox.setAttribute( "ondblclick", "monthEventBoxDoubleClickEvent( this, event )" ); eventBox.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarEventDisplay, event )" ); eventBox.setAttribute( "tooltip", "gridOccurrenceTooltip" ); - eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); // add a property to the event box that holds the calendarEvent that the // box represents @@ -485,7 +477,6 @@ MonthView.prototype.createEventBoxInternal = function(itemOccurrence, startDate, //you need this flex in order for text to crop eventBoxText.setAttribute( "flex", "1" ); - eventBoxText.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); // add the text to the event box and the event box to the day box diff --git a/calendar/resources/content/multiweekView.js b/calendar/resources/content/multiweekView.js index a0b084245fdd..1a5489386060 100644 --- a/calendar/resources/content/multiweekView.js +++ b/calendar/resources/content/multiweekView.js @@ -198,10 +198,6 @@ function MultiweekView( calendarWindow ) dayBoxItem.setAttribute( "onclick", "gCalendarWindow.multiweekView.clickDay( event )" ); dayBoxItem.setAttribute( "oncontextmenu", "gCalendarWindow.multiweekView.contextClickDay( event )" ); - - //set the drop - dayBoxItem.setAttribute( "ondragdrop", "nsDragAndDrop.drop(event,monthViewEventDragAndDropObserver)" ); - dayBoxItem.setAttribute( "ondragover", "nsDragAndDrop.dragOver(event,monthViewEventDragAndDropObserver)" ); //set the double click of day boxes dayBoxItem.setAttribute( "ondblclick", "gCalendarWindow.multiweekView.doubleClickDay( event )" ); @@ -300,7 +296,6 @@ MultiweekView.prototype.createEventDotInternal = function(itemOccurrence, startD eventDot.setAttribute("ondblclick", "monthEventBoxDoubleClickEvent( this, event )" ); eventDot.setAttribute("onmouseover", "onMouseOverGridOccurrence(event)" ); eventDot.setAttribute("tooltip", "gridOccurrenceTooltip" ); - eventDot.setAttribute("ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); eventDot.occurrence = itemOccurrence; // for mouseover preview eventDot.event = calEvent; eventDotBox.appendChild( eventDot ); @@ -367,7 +362,6 @@ MultiweekView.prototype.createEventBoxInternal = function multiweekView_createEv eventBox.setAttribute( "ondblclick", "monthEventBoxDoubleClickEvent( this, event )" ); eventBox.setAttribute( "onmouseover", "onMouseOverGridOccurrence(event)" ); eventBox.setAttribute( "tooltip", "gridOccurrenceTooltip" ); - eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); eventBox.occurrence = itemOccurrence; eventBox.event = calEvent; @@ -428,7 +422,6 @@ MultiweekView.prototype.getToDoBox = function multiweekView_getToDoBox( calendar eventBox.setAttribute( "ondblclick", "multiweekToDoBoxDoubleClickEvent( this, event )" ); eventBox.setAttribute( "onmouseover", "gCalendarWindow.changeMouseOverInfo( calendarToDo, event )" ); eventBox.setAttribute( "tooltip", "gridOccurrenceTooltip" ); - //eventBox.setAttribute( "ondraggesture", "nsDragAndDrop.startDrag(event,monthViewEventDragAndDropObserver);" ); // add a property to the event box that holds the calendarEvent that the // box represents diff --git a/calendar/resources/content/weekView.js b/calendar/resources/content/weekView.js index e3d16f7d49ad..321ec41cb812 100644 --- a/calendar/resources/content/weekView.js +++ b/calendar/resources/content/weekView.js @@ -447,9 +447,6 @@ WeekView.prototype.createEventBoxInternal = function (event) eventBox.setAttribute("dayindex", index + 1); eventBox.setAttribute("onclick", "weekEventItemClick(this, event)" ); eventBox.setAttribute("ondblclick", "weekEventItemDoubleClick(this, event)"); - eventBox.setAttribute("ondraggesture", "nsDragAndDrop.startDrag(event,calendarViewDNDObserver);"); - eventBox.setAttribute("ondragover", "nsDragAndDrop.dragOver(event,calendarViewDNDObserver)"); - eventBox.setAttribute("ondragdrop", "nsDragAndDrop.drop(event,calendarViewDNDObserver)"); eventBox.setAttribute("id", "week-view-event-box-" + calEvent.id); eventBox.setAttribute("name", "week-view-event-box-" + calEvent.id); eventBox.setAttribute("onmouseover", "onMouseOverGridOccurrence(event)" ); diff --git a/calendar/sunbird/base/content/calendar.xul b/calendar/sunbird/base/content/calendar.xul index 1f706bb60bd5..1dfd5bba9f48 100644 --- a/calendar/sunbird/base/content/calendar.xul +++ b/calendar/sunbird/base/content/calendar.xul @@ -425,12 +425,17 @@ + + +