From 59550167a708ad43f048a994bd20fe453fa04857 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Fri, 12 Jul 2013 00:33:14 -0400 Subject: [PATCH] Move TinyMCE into resource:// This fixes CSS in popups and probably other things. --- chrome/content/zotero/bindings/styled-textbox.xml | 6 +----- .../tinymce/css/integration-content.css | 0 .../tinymce/css/note-content.css | 0 .../zotero => resource}/tinymce/css/note-ui.css | 0 .../zotero => resource}/tinymce/integration.html | 0 .../content/zotero => resource}/tinymce/langs/en.js | 0 .../content/zotero => resource}/tinymce/license.txt | 0 .../content/zotero => resource}/tinymce/note.html | 0 .../zotero => resource}/tinymce/noteview.html | 0 .../tinymce/plugins/contextmenu/editor_plugin.js | 0 .../tinymce/plugins/directionality/editor_plugin.js | 0 .../tinymce/plugins/paste/editor_plugin.js | 0 .../tinymce/themes/advanced/about.htm | 0 .../tinymce/themes/advanced/anchor.htm | 0 .../tinymce/themes/advanced/charmap.htm | 0 .../tinymce/themes/advanced/color_picker.htm | 0 .../tinymce/themes/advanced/editor_template.js | 0 .../tinymce/themes/advanced/image.htm | 0 .../tinymce/themes/advanced/img/colorpicker.jpg | Bin .../tinymce/themes/advanced/img/icons.gif | Bin .../tinymce/themes/advanced/js/about.js | 0 .../tinymce/themes/advanced/js/anchor.js | 0 .../tinymce/themes/advanced/js/charmap.js | 0 .../tinymce/themes/advanced/js/color_picker.js | 0 .../tinymce/themes/advanced/js/image.js | 0 .../tinymce/themes/advanced/js/link.js | 0 .../tinymce/themes/advanced/js/source_editor.js | 0 .../tinymce/themes/advanced/langs/en.js | 0 .../tinymce/themes/advanced/langs/en_dlg.js | 0 .../tinymce/themes/advanced/link.htm | 0 .../themes/advanced/skins/default/content.css | 0 .../themes/advanced/skins/default/dialog.css | 0 .../themes/advanced/skins/default/img/buttons.png | Bin .../themes/advanced/skins/default/img/items.gif | Bin .../advanced/skins/default/img/menu_arrow.gif | Bin .../advanced/skins/default/img/menu_check.gif | Bin .../themes/advanced/skins/default/img/progress.gif | Bin .../themes/advanced/skins/default/img/tabs.gif | Bin .../tinymce/themes/advanced/skins/default/ui.css | 0 .../tinymce/themes/advanced/source_editor.htm | 0 .../content/zotero => resource}/tinymce/tiny_mce.js | 0 .../zotero => resource}/tinymce/tiny_mce_popup.js | 0 .../tinymce/utils/editable_selects.js | 0 .../zotero => resource}/tinymce/utils/form_utils.js | 0 .../zotero => resource}/tinymce/utils/mctabs.js | 0 .../zotero => resource}/tinymce/utils/validate.js | 0 46 files changed, 1 insertion(+), 5 deletions(-) rename {chrome/content/zotero => resource}/tinymce/css/integration-content.css (100%) rename {chrome/content/zotero => resource}/tinymce/css/note-content.css (100%) rename {chrome/content/zotero => resource}/tinymce/css/note-ui.css (100%) rename {chrome/content/zotero => resource}/tinymce/integration.html (100%) rename {chrome/content/zotero => resource}/tinymce/langs/en.js (100%) rename {chrome/content/zotero => resource}/tinymce/license.txt (100%) rename {chrome/content/zotero => resource}/tinymce/note.html (100%) rename {chrome/content/zotero => resource}/tinymce/noteview.html (100%) rename {chrome/content/zotero => resource}/tinymce/plugins/contextmenu/editor_plugin.js (100%) rename {chrome/content/zotero => resource}/tinymce/plugins/directionality/editor_plugin.js (100%) rename {chrome/content/zotero => resource}/tinymce/plugins/paste/editor_plugin.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/about.htm (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/anchor.htm (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/charmap.htm (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/color_picker.htm (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/editor_template.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/image.htm (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/img/colorpicker.jpg (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/img/icons.gif (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/about.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/anchor.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/charmap.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/color_picker.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/image.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/link.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/js/source_editor.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/langs/en.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/langs/en_dlg.js (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/link.htm (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/content.css (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/dialog.css (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/img/buttons.png (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/img/items.gif (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/img/menu_arrow.gif (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/img/menu_check.gif (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/img/progress.gif (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/img/tabs.gif (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/skins/default/ui.css (100%) rename {chrome/content/zotero => resource}/tinymce/themes/advanced/source_editor.htm (100%) rename {chrome/content/zotero => resource}/tinymce/tiny_mce.js (100%) rename {chrome/content/zotero => resource}/tinymce/tiny_mce_popup.js (100%) rename {chrome/content/zotero => resource}/tinymce/utils/editable_selects.js (100%) rename {chrome/content/zotero => resource}/tinymce/utils/form_utils.js (100%) rename {chrome/content/zotero => resource}/tinymce/utils/mctabs.js (100%) rename {chrome/content/zotero => resource}/tinymce/utils/validate.js (100%) diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml index 47be7dc4c..4dcd2a3ad 100644 --- a/chrome/content/zotero/bindings/styled-textbox.xml +++ b/chrome/content/zotero/bindings/styled-textbox.xml @@ -349,11 +349,7 @@ var ios = Components.classes["@mozilla.org/network/io-service;1"]. getService(Components.interfaces.nsIIOService); - var uri = ios.newURI("chrome://zotero/content/tinymce/" + htmlFile + ".html", null, null); - - var cr = Components.classes["@mozilla.org/chrome/chrome-registry;1"] - .getService(Components.interfaces.nsIChromeRegistry); - uri = cr.convertChromeURL(uri); + var uri = ios.newURI("resource://zotero/tinymce/" + htmlFile + ".html", null, null); // Pass directionality (LTR/RTL) in URL uri.spec += "?dir=" + Zotero.dir; diff --git a/chrome/content/zotero/tinymce/css/integration-content.css b/resource/tinymce/css/integration-content.css similarity index 100% rename from chrome/content/zotero/tinymce/css/integration-content.css rename to resource/tinymce/css/integration-content.css diff --git a/chrome/content/zotero/tinymce/css/note-content.css b/resource/tinymce/css/note-content.css similarity index 100% rename from chrome/content/zotero/tinymce/css/note-content.css rename to resource/tinymce/css/note-content.css diff --git a/chrome/content/zotero/tinymce/css/note-ui.css b/resource/tinymce/css/note-ui.css similarity index 100% rename from chrome/content/zotero/tinymce/css/note-ui.css rename to resource/tinymce/css/note-ui.css diff --git a/chrome/content/zotero/tinymce/integration.html b/resource/tinymce/integration.html similarity index 100% rename from chrome/content/zotero/tinymce/integration.html rename to resource/tinymce/integration.html diff --git a/chrome/content/zotero/tinymce/langs/en.js b/resource/tinymce/langs/en.js similarity index 100% rename from chrome/content/zotero/tinymce/langs/en.js rename to resource/tinymce/langs/en.js diff --git a/chrome/content/zotero/tinymce/license.txt b/resource/tinymce/license.txt similarity index 100% rename from chrome/content/zotero/tinymce/license.txt rename to resource/tinymce/license.txt diff --git a/chrome/content/zotero/tinymce/note.html b/resource/tinymce/note.html similarity index 100% rename from chrome/content/zotero/tinymce/note.html rename to resource/tinymce/note.html diff --git a/chrome/content/zotero/tinymce/noteview.html b/resource/tinymce/noteview.html similarity index 100% rename from chrome/content/zotero/tinymce/noteview.html rename to resource/tinymce/noteview.html diff --git a/chrome/content/zotero/tinymce/plugins/contextmenu/editor_plugin.js b/resource/tinymce/plugins/contextmenu/editor_plugin.js similarity index 100% rename from chrome/content/zotero/tinymce/plugins/contextmenu/editor_plugin.js rename to resource/tinymce/plugins/contextmenu/editor_plugin.js diff --git a/chrome/content/zotero/tinymce/plugins/directionality/editor_plugin.js b/resource/tinymce/plugins/directionality/editor_plugin.js similarity index 100% rename from chrome/content/zotero/tinymce/plugins/directionality/editor_plugin.js rename to resource/tinymce/plugins/directionality/editor_plugin.js diff --git a/chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js b/resource/tinymce/plugins/paste/editor_plugin.js similarity index 100% rename from chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js rename to resource/tinymce/plugins/paste/editor_plugin.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/about.htm b/resource/tinymce/themes/advanced/about.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/about.htm rename to resource/tinymce/themes/advanced/about.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/anchor.htm b/resource/tinymce/themes/advanced/anchor.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/anchor.htm rename to resource/tinymce/themes/advanced/anchor.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/charmap.htm b/resource/tinymce/themes/advanced/charmap.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/charmap.htm rename to resource/tinymce/themes/advanced/charmap.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/color_picker.htm b/resource/tinymce/themes/advanced/color_picker.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/color_picker.htm rename to resource/tinymce/themes/advanced/color_picker.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/editor_template.js b/resource/tinymce/themes/advanced/editor_template.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/editor_template.js rename to resource/tinymce/themes/advanced/editor_template.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/image.htm b/resource/tinymce/themes/advanced/image.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/image.htm rename to resource/tinymce/themes/advanced/image.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/img/colorpicker.jpg b/resource/tinymce/themes/advanced/img/colorpicker.jpg similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/img/colorpicker.jpg rename to resource/tinymce/themes/advanced/img/colorpicker.jpg diff --git a/chrome/content/zotero/tinymce/themes/advanced/img/icons.gif b/resource/tinymce/themes/advanced/img/icons.gif similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/img/icons.gif rename to resource/tinymce/themes/advanced/img/icons.gif diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/about.js b/resource/tinymce/themes/advanced/js/about.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/about.js rename to resource/tinymce/themes/advanced/js/about.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/anchor.js b/resource/tinymce/themes/advanced/js/anchor.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/anchor.js rename to resource/tinymce/themes/advanced/js/anchor.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/charmap.js b/resource/tinymce/themes/advanced/js/charmap.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/charmap.js rename to resource/tinymce/themes/advanced/js/charmap.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/color_picker.js b/resource/tinymce/themes/advanced/js/color_picker.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/color_picker.js rename to resource/tinymce/themes/advanced/js/color_picker.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/image.js b/resource/tinymce/themes/advanced/js/image.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/image.js rename to resource/tinymce/themes/advanced/js/image.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/link.js b/resource/tinymce/themes/advanced/js/link.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/link.js rename to resource/tinymce/themes/advanced/js/link.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/source_editor.js b/resource/tinymce/themes/advanced/js/source_editor.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/js/source_editor.js rename to resource/tinymce/themes/advanced/js/source_editor.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/langs/en.js b/resource/tinymce/themes/advanced/langs/en.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/langs/en.js rename to resource/tinymce/themes/advanced/langs/en.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/langs/en_dlg.js b/resource/tinymce/themes/advanced/langs/en_dlg.js similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/langs/en_dlg.js rename to resource/tinymce/themes/advanced/langs/en_dlg.js diff --git a/chrome/content/zotero/tinymce/themes/advanced/link.htm b/resource/tinymce/themes/advanced/link.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/link.htm rename to resource/tinymce/themes/advanced/link.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/content.css b/resource/tinymce/themes/advanced/skins/default/content.css similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/content.css rename to resource/tinymce/themes/advanced/skins/default/content.css diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/dialog.css b/resource/tinymce/themes/advanced/skins/default/dialog.css similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/dialog.css rename to resource/tinymce/themes/advanced/skins/default/dialog.css diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/buttons.png b/resource/tinymce/themes/advanced/skins/default/img/buttons.png similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/img/buttons.png rename to resource/tinymce/themes/advanced/skins/default/img/buttons.png diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/items.gif b/resource/tinymce/themes/advanced/skins/default/img/items.gif similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/img/items.gif rename to resource/tinymce/themes/advanced/skins/default/img/items.gif diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/menu_arrow.gif b/resource/tinymce/themes/advanced/skins/default/img/menu_arrow.gif similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/img/menu_arrow.gif rename to resource/tinymce/themes/advanced/skins/default/img/menu_arrow.gif diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/menu_check.gif b/resource/tinymce/themes/advanced/skins/default/img/menu_check.gif similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/img/menu_check.gif rename to resource/tinymce/themes/advanced/skins/default/img/menu_check.gif diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/progress.gif b/resource/tinymce/themes/advanced/skins/default/img/progress.gif similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/img/progress.gif rename to resource/tinymce/themes/advanced/skins/default/img/progress.gif diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/tabs.gif b/resource/tinymce/themes/advanced/skins/default/img/tabs.gif similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/img/tabs.gif rename to resource/tinymce/themes/advanced/skins/default/img/tabs.gif diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css b/resource/tinymce/themes/advanced/skins/default/ui.css similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css rename to resource/tinymce/themes/advanced/skins/default/ui.css diff --git a/chrome/content/zotero/tinymce/themes/advanced/source_editor.htm b/resource/tinymce/themes/advanced/source_editor.htm similarity index 100% rename from chrome/content/zotero/tinymce/themes/advanced/source_editor.htm rename to resource/tinymce/themes/advanced/source_editor.htm diff --git a/chrome/content/zotero/tinymce/tiny_mce.js b/resource/tinymce/tiny_mce.js similarity index 100% rename from chrome/content/zotero/tinymce/tiny_mce.js rename to resource/tinymce/tiny_mce.js diff --git a/chrome/content/zotero/tinymce/tiny_mce_popup.js b/resource/tinymce/tiny_mce_popup.js similarity index 100% rename from chrome/content/zotero/tinymce/tiny_mce_popup.js rename to resource/tinymce/tiny_mce_popup.js diff --git a/chrome/content/zotero/tinymce/utils/editable_selects.js b/resource/tinymce/utils/editable_selects.js similarity index 100% rename from chrome/content/zotero/tinymce/utils/editable_selects.js rename to resource/tinymce/utils/editable_selects.js diff --git a/chrome/content/zotero/tinymce/utils/form_utils.js b/resource/tinymce/utils/form_utils.js similarity index 100% rename from chrome/content/zotero/tinymce/utils/form_utils.js rename to resource/tinymce/utils/form_utils.js diff --git a/chrome/content/zotero/tinymce/utils/mctabs.js b/resource/tinymce/utils/mctabs.js similarity index 100% rename from chrome/content/zotero/tinymce/utils/mctabs.js rename to resource/tinymce/utils/mctabs.js diff --git a/chrome/content/zotero/tinymce/utils/validate.js b/resource/tinymce/utils/validate.js similarity index 100% rename from chrome/content/zotero/tinymce/utils/validate.js rename to resource/tinymce/utils/validate.js