commit 59550167a708ad43f048a994bd20fe453fa04857 parent 7ec7039a9a3e0745a75705851b8725fd188f8a9f Author: Dan Stillman <dstillman@zotero.org> Date: Fri, 12 Jul 2013 00:33:14 -0400 Move TinyMCE into resource:// This fixes CSS in popups and probably other things. Diffstat:
46 files changed, 1 insertion(+), 5 deletions(-)
diff --git 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 diff --git a/chrome/content/zotero/tinymce/css/note-content.css b/resource/tinymce/css/note-content.css diff --git a/chrome/content/zotero/tinymce/css/note-ui.css b/resource/tinymce/css/note-ui.css diff --git a/chrome/content/zotero/tinymce/integration.html b/resource/tinymce/integration.html diff --git a/chrome/content/zotero/tinymce/langs/en.js b/resource/tinymce/langs/en.js diff --git a/chrome/content/zotero/tinymce/license.txt b/resource/tinymce/license.txt diff --git a/chrome/content/zotero/tinymce/note.html b/resource/tinymce/note.html diff --git a/chrome/content/zotero/tinymce/noteview.html b/resource/tinymce/noteview.html diff --git a/chrome/content/zotero/tinymce/plugins/contextmenu/editor_plugin.js b/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 diff --git a/chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/anchor.htm b/resource/tinymce/themes/advanced/anchor.htm diff --git a/chrome/content/zotero/tinymce/themes/advanced/charmap.htm b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/editor_template.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/img/colorpicker.jpg b/resource/tinymce/themes/advanced/img/colorpicker.jpg Binary files differ. diff --git a/chrome/content/zotero/tinymce/themes/advanced/img/icons.gif b/resource/tinymce/themes/advanced/img/icons.gif Binary files differ. diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/about.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/charmap.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/image.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/js/source_editor.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/langs/en_dlg.js b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/content.css b/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 diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/buttons.png b/resource/tinymce/themes/advanced/skins/default/img/buttons.png Binary files differ. diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/items.gif b/resource/tinymce/themes/advanced/skins/default/img/items.gif Binary files differ. 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 Binary files differ. 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 Binary files differ. diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/progress.gif b/resource/tinymce/themes/advanced/skins/default/img/progress.gif Binary files differ. diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/img/tabs.gif b/resource/tinymce/themes/advanced/skins/default/img/tabs.gif Binary files differ. diff --git a/chrome/content/zotero/tinymce/themes/advanced/skins/default/ui.css b/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 diff --git a/chrome/content/zotero/tinymce/tiny_mce.js b/resource/tinymce/tiny_mce.js diff --git a/chrome/content/zotero/tinymce/tiny_mce_popup.js b/resource/tinymce/tiny_mce_popup.js diff --git a/chrome/content/zotero/tinymce/utils/editable_selects.js b/resource/tinymce/utils/editable_selects.js diff --git a/chrome/content/zotero/tinymce/utils/form_utils.js b/resource/tinymce/utils/form_utils.js diff --git a/chrome/content/zotero/tinymce/utils/mctabs.js b/resource/tinymce/utils/mctabs.js diff --git a/chrome/content/zotero/tinymce/utils/validate.js b/resource/tinymce/utils/validate.js
