diff --git a/calendar/resources/content/calendarDayView.js b/calendar/resources/content/calendarDayView.js index c8e3e7da18d..6e9c27a292f 100644 --- a/calendar/resources/content/calendarDayView.js +++ b/calendar/resources/content/calendarDayView.js @@ -592,7 +592,7 @@ var gStartDate = null; var gEndDate = null; -var eventEndObserver = { +var dayEventEndObserver = { getSupportedFlavours : function () { var flavours = new FlavourSet(); flavours.appendFlavour("text/unicode"); @@ -620,7 +620,7 @@ var eventEndObserver = { } }; -var eventStartObserver = { +var dayEventStartObserver = { onDragStart: function (evt, transferData, action){ gStartDate = new Date( gCalendarWindow.getSelectedDate() ); diff --git a/calendar/resources/content/calendarDayView.xul b/calendar/resources/content/calendarDayView.xul index b9954e3d188..095811cdb88 100644 --- a/calendar/resources/content/calendarDayView.xul +++ b/calendar/resources/content/calendarDayView.xul @@ -116,145 +116,145 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/calendar/resources/content/calendarWeekView.js b/calendar/resources/content/calendarWeekView.js index b97663953f7..3148b2c9767 100644 --- a/calendar/resources/content/calendarWeekView.js +++ b/calendar/resources/content/calendarWeekView.js @@ -679,12 +679,13 @@ var gStartDate = null; var eventEndObserver = { getSupportedFlavours : function () { - var flavours = new FlavourSet(); - flavours.appendFlavour("text/unicode"); - return flavours; + var weekflavours = new FlavourSet(); + weekflavours.appendFlavour("text/unicode"); + return weekflavours; }, onDragOver: function (evt,flavour,session){ - evt.target.setAttribute( "draggedover", "true" ); + dump( "\nDragged Over" ); + evt.target.setAttribute( "draggedover", "true" ); }, onDrop: function (evt,dropdata,session){ var EndDate = new Date( gStartDate.getTime() ); @@ -709,17 +710,15 @@ var eventStartObserver = { onDragStart: function (evt, transferData, action){ var dayIndex = evt.target.getAttribute( "day" ); - newDate = gHeaderDateItemArray[dayIndex].getAttribute( "date" ); - - gCalendarWindow.setSelectedDate( newDate ); + var newDate = gHeaderDateItemArray[dayIndex].getAttribute( "date" ); + //gCalendarWindow.setSelectedDate( newDate ); - gStartDate = newDate; + gStartDate = new Date( newDate ); gStartDate.setHours( evt.target.getAttribute( "hour" ) ); gStartDate.setMinutes( 0 ); gStartDate.setSeconds( 0 ); - - transferData.data=new TransferData(); - transferData.data.addDataForFlavour("text/unicode",0); + transferData.data=new TransferData(); + transferData.data.addDataForFlavour("text/unicode",0); } }; diff --git a/calendar/resources/content/dayView.js b/calendar/resources/content/dayView.js index c8e3e7da18d..6e9c27a292f 100644 --- a/calendar/resources/content/dayView.js +++ b/calendar/resources/content/dayView.js @@ -592,7 +592,7 @@ var gStartDate = null; var gEndDate = null; -var eventEndObserver = { +var dayEventEndObserver = { getSupportedFlavours : function () { var flavours = new FlavourSet(); flavours.appendFlavour("text/unicode"); @@ -620,7 +620,7 @@ var eventEndObserver = { } }; -var eventStartObserver = { +var dayEventStartObserver = { onDragStart: function (evt, transferData, action){ gStartDate = new Date( gCalendarWindow.getSelectedDate() ); diff --git a/calendar/resources/content/dayView.xul b/calendar/resources/content/dayView.xul index b9954e3d188..095811cdb88 100644 --- a/calendar/resources/content/dayView.xul +++ b/calendar/resources/content/dayView.xul @@ -116,145 +116,145 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/calendar/resources/content/weekView.js b/calendar/resources/content/weekView.js index b97663953f7..3148b2c9767 100644 --- a/calendar/resources/content/weekView.js +++ b/calendar/resources/content/weekView.js @@ -679,12 +679,13 @@ var gStartDate = null; var eventEndObserver = { getSupportedFlavours : function () { - var flavours = new FlavourSet(); - flavours.appendFlavour("text/unicode"); - return flavours; + var weekflavours = new FlavourSet(); + weekflavours.appendFlavour("text/unicode"); + return weekflavours; }, onDragOver: function (evt,flavour,session){ - evt.target.setAttribute( "draggedover", "true" ); + dump( "\nDragged Over" ); + evt.target.setAttribute( "draggedover", "true" ); }, onDrop: function (evt,dropdata,session){ var EndDate = new Date( gStartDate.getTime() ); @@ -709,17 +710,15 @@ var eventStartObserver = { onDragStart: function (evt, transferData, action){ var dayIndex = evt.target.getAttribute( "day" ); - newDate = gHeaderDateItemArray[dayIndex].getAttribute( "date" ); - - gCalendarWindow.setSelectedDate( newDate ); + var newDate = gHeaderDateItemArray[dayIndex].getAttribute( "date" ); + //gCalendarWindow.setSelectedDate( newDate ); - gStartDate = newDate; + gStartDate = new Date( newDate ); gStartDate.setHours( evt.target.getAttribute( "hour" ) ); gStartDate.setMinutes( 0 ); gStartDate.setSeconds( 0 ); - - transferData.data=new TransferData(); - transferData.data.addDataForFlavour("text/unicode",0); + transferData.data=new TransferData(); + transferData.data.addDataForFlavour("text/unicode",0); } };