Bug 1626391 - Fix calendar printing by giving templates URLs that work. r=pmorris
authorGeoff Lankow <geoff@darktrojan.net>
Fri, 17 Apr 2020 11:59:57 +1200
changeset 37973 6c708ef50ab7e74e16d63e113e730939eb012d3d
parent 37972 7ef1b81d70f7ee785a89f2d63c2e4b7638bd4f8b
child 37974 71abdc0e3d3f77cb87891a7f46288cc7c62f72ad
push id2595
push userclokep@gmail.com
push dateMon, 04 May 2020 19:02:04 +0000
treeherdercomm-beta@f53913797371 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspmorris
bugs1626391
Bug 1626391 - Fix calendar printing by giving templates URLs that work. r=pmorris
calendar/import-export/CalHtmlExport.jsm
calendar/import-export/CalMonthGridPrinter.jsm
calendar/import-export/CalWeekPrinter.jsm
calendar/import-export/jar.mn
--- a/calendar/import-export/CalHtmlExport.jsm
+++ b/calendar/import-export/CalHtmlExport.jsm
@@ -26,17 +26,17 @@ CalHtmlExporter.prototype = {
         defaultExtension: "html",
         extensionFilter: wildmat,
         description: label,
       },
     ];
   },
 
   exportToStream(aStream, aItems, aTitle) {
-    let document = cal.xml.parseFile("chrome://calendar/skin/shared/printing/calHtmlExport.html");
+    let document = cal.xml.parseFile("chrome://calendar/content/printing/calHtmlExport.html");
     let itemContainer = document.getElementById("item-container");
     document.getElementById("title").textContent = aTitle || cal.l10n.getCalString("HTMLTitle");
 
     // Sort aItems
     aItems.sort((a, b) => {
       let start_a = a[cal.dtz.startDateProp(a)];
       if (!start_a) {
         return -1;
--- a/calendar/import-export/CalMonthGridPrinter.jsm
+++ b/calendar/import-export/CalMonthGridPrinter.jsm
@@ -18,19 +18,17 @@ CalMonthPrinter.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.calIPrintFormatter]),
   classID: Components.ID("{f42d5132-92c4-487b-b5c8-38bf292d74c1}"),
 
   get name() {
     return cal.l10n.getCalString("monthPrinterName");
   },
 
   formatToHtml(aStream, aStart, aEnd, aItems, aTitle) {
-    let document = cal.xml.parseFile(
-      "chrome://calendar/skin/shared/printing/calMonthGridPrinter.html"
-    );
+    let document = cal.xml.parseFile("chrome://calendar/content/printing/calMonthGridPrinter.html");
     let defaultTimezone = cal.dtz.defaultTimezone;
 
     // Set page title
     document.getElementById("title").textContent = aTitle;
 
     cal.view.colorTracker.addColorsToDocument(document);
 
     // Table that maps YYYY-MM-DD to the DOM node container where items are to be added
--- a/calendar/import-export/CalWeekPrinter.jsm
+++ b/calendar/import-export/CalWeekPrinter.jsm
@@ -18,17 +18,17 @@ CalWeekPrinter.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.calIPrintFormatter]),
   classID: Components.ID("{2d6ec97b-9109-4b92-89c5-d4b4806619ce}"),
 
   get name() {
     return cal.l10n.getCalString("weekPrinterName");
   },
 
   formatToHtml(aStream, aStart, aEnd, aItems, aTitle) {
-    let document = cal.xml.parseFile("chrome://calendar/skin/shared/printing/calWeekPrinter.html");
+    let document = cal.xml.parseFile("chrome://calendar/content/printing/calWeekPrinter.html");
     let defaultTimezone = cal.dtz.defaultTimezone;
 
     // Set page title
     document.getElementById("title").textContent = aTitle;
 
     cal.view.colorTracker.addColorsToDocument(document);
 
     // Table that maps YYYY-MM-DD to the DOM node container where items are to be added
--- a/calendar/import-export/jar.mn
+++ b/calendar/import-export/jar.mn
@@ -1,9 +1,9 @@
 #filter substitution
 # 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/.
 
 calendar.jar:
-    skin/common/printing/calHtmlExport.html              (calHtmlExport.html)
-    skin/common/printing/calMonthGridPrinter.html        (calMonthGridPrinter.html)
-    skin/common/printing/calWeekPrinter.html             (calWeekPrinter.html)
+  content/printing/calHtmlExport.html              (calHtmlExport.html)
+  content/printing/calMonthGridPrinter.html        (calMonthGridPrinter.html)
+  content/printing/calWeekPrinter.html             (calWeekPrinter.html)