Merge branch 'master' into ec-3.8

Ericsson · Apr 26, 2016 · cb34207 · cb34207
2 parents 2619009 + 5e02727
commit cb34207
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 26 deletions.
diff --git a/chrome/content/attachments-view.xul b/chrome/content/attachments-view.xul
@@ -92,13 +92,7 @@
 	</toolbarpalette>
      <toolbar id="event-toolbar" defaultset="button-save,button-attendees,button-privacy,button-url,exchWebService-add-attachment-button,button-delete"> 
      </toolbar> 
-
-	<listbox id="exchWebService-attachment-link"
-		context="exchWebService-attachment-popup"
-		rows="2"
-		onkeypress="tmpAttachment.onKeyPress(event);"
-		ondblclick="tmpAttachment.onDblClick(event);"
-		onselect="tmpAttachment.onSelect(event);"/>
+
 
 </overlay>
 

diff --git a/chrome/content/calendar-common-sets.xul b/chrome/content/calendar-common-sets.xul
@@ -43,7 +43,7 @@
 ]>
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 	<script type="application/javascript" src="chrome://exchangecalendar/content/calendar-common-sets.js" />
-    <script type="application/javascript" src="chrome://exchangecalendar/content/calendar-common-sets2.js" />
+    <script type="application/javascript" src="chrome://exchangecalendar/content/exchService-common-sets.js" />
 
 	<commandset id="calendar_commands" commandupdater="true"
 		events="calendar_commands" oncommandupdate="calendarController.updateCommands()">

diff --git a/chrome/content/calendar-task-view.js b/chrome/content/calendar-task-view.js
@@ -1,8 +1,6 @@
 /*
  * Owner:Ericsson
- */
-
-
+ */ 
 var Cc = Components.classes;
 var Ci = Components.interfaces;
 var Cu = Components.utils;
@@ -54,7 +52,7 @@ function taskHtmlDetailsView(event){
 			if( item.calendar.type == "exchangecalendar" ){ 
 			   //Html manipulations
 			   var ele =  document.getElementById("calendar-task-details-description"); 
-			   var ele2 = document.getElementById("calendar-task-details-description2"); 
+			   var ele2 = document.getElementById("exchService-task-details-description"); 
 
 				//remove existing task view 
 				//ele.parentNode.removeChild(ele);
@@ -101,6 +99,10 @@ function taskHtmlDetailsView(event){
 								var collection = query.getCollection(queryListener);
 					}
 				}  
+		}
+		else {
+			document.getElementById("exchService-task-details-description").hidden = true;
+			document.getElementById("calendar-task-details-description").hidden = false;
 		} 
 	  }
    }

diff --git a/chrome/content/calendar-task-view.xul b/chrome/content/calendar-task-view.xul
@@ -58,7 +58,7 @@
 
     <vbox id="calendar-task-box" onselect="taskHtmlDetailsView(event);"/>
      <vbox id="calendar-task-details-container">
-        <browser id="calendar-task-details-description2"
+        <browser id="exchService-task-details-description"
              name="messagepane02"
              height="0"
              flex="1"
@@ -93,16 +93,6 @@
       </menupopup>
     </popupset>
 
-	<hbox id="calendar-task-details-attachment-row">
-		<vbox id="exchWebService-attachments-row"
-			flex="1"
-			collapsed="true" insertbefore="calendar-task-details-attachment-rows">
-
-			<listbox id="exchWebService-attachment-link" rows="3" flex="1"/>
-
-		</vbox>
-	</hbox>
-
 </overlay>
 
 
diff --git a/chrome/content/calendar-common-sets2.js → chrome/content/exchService-common-sets.js b/chrome/content/calendar-common-sets2.js → chrome/content/exchService-common-sets.js
@@ -23,7 +23,8 @@ newOpenEventDialog(calendarItem, calendar, mode, callback, job, initialDate);
 }
 
 function newOpenEventDialog(calendarItem, calendar, mode, callback, job, initialDate) {
-    let dlg = cal.findItemWindow(calendarItem);
+   calendarItem = calendarItem.clone();
+   let dlg = cal.findItemWindow(calendarItem);
     if (dlg) {
         dlg.focus();
         disposeJob(job);
@@ -125,8 +126,8 @@ function newOpenEventDialog(calendarItem, calendar, mode, callback, job, initial
     } else {
         url = "chrome://calendar/content/calendar-summary-dialog.xul";
     }
-    
-    if( calendarItem.itemClass == "IPM.Note" )   url = "chrome://exchangecalendar/content/calendar-event-dialog2.xul";
+
+    if( calendarItem.itemClass == "IPM.Note" )   url = "chrome://exchangecalendar/content/exchService-followup-event-dialog.xul";
 
     // reminder: event dialog should not be modal (cf bug 122671)
     var features;

diff --git a/chrome/content/calendar-event-dialog2.xul → ...ent/exchService-followup-event-dialog.xml b/chrome/content/calendar-event-dialog2.xul → ...ent/exchService-followup-event-dialog.xml