From e17b09b2cc676f3066bf472dc3516b1b03a684bc Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 02:36:38 +0000 Subject: [PATCH] MINOR Changed paths to moved thirdparty dependencies (mostly from /jsparty to /sapphire/thirdparty, /cms/javascript and /sapphire/javascript) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92613 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 8 +- code/ImageEditor.php | 6 +- code/LeftAndMain.php | 81 ++++++++++--------- code/ModelAdmin.php | 10 +-- code/SecurityAdmin.php | 2 +- code/sitefeatures/PageCommentInterface.php | 6 +- javascript/Upload.js | 2 +- .../tinymce_ssbuttons/editor_plugin_src.js | 2 +- .../tinymce_ssmacron/editor_plugin_src.js | 2 +- 9 files changed, 60 insertions(+), 59 deletions(-) diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 30846a4e..6e8e79e0 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -86,7 +86,7 @@ class AssetAdmin extends LeftAndMain { Requirements::javascript(CMS_DIR . "/javascript/CMSMain_upload.js"); Requirements::javascript(CMS_DIR . "/javascript/Upload.js"); - Requirements::javascript(THIRDPARTY_DIR . "/SWFUpload/swfupload.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/swfupload/swfupload.js"); Requirements::javascript(THIRDPARTY_DIR . "/greybox/AmiJS.js"); Requirements::javascript(THIRDPARTY_DIR . "/greybox/greybox.js"); @@ -111,10 +111,10 @@ JS function uploadiframe() { Requirements::clear(); - Requirements::javascript(THIRDPARTY_DIR . "/prototype.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/loader.js"); - Requirements::javascript(THIRDPARTY_DIR . "/behaviour.js"); - Requirements::javascript(THIRDPARTY_DIR . "/prototype_improvements.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js"); + Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js"); Requirements::javascript(THIRDPARTY_DIR . "/layout_helpers.js"); Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js"); Requirements::javascript(THIRDPARTY_DIR . "/multifile/multifile.js"); diff --git a/code/ImageEditor.php b/code/ImageEditor.php index b0cdd2ed..d67bee4f 100644 --- a/code/ImageEditor.php +++ b/code/ImageEditor.php @@ -22,8 +22,8 @@ class ImageEditor extends Controller { */ public function index() { Requirements::clear(); - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/scriptaculous.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/scriptaculous.js'); Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Utils.js'); //Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/ImageHistory.js'); Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/Image.js'); @@ -38,7 +38,7 @@ class ImageEditor extends Controller { Requirements::javascript(CMS_DIR . '/javascript/ImageEditor/DocumentBody.js'); Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); Requirements::javascript(CMS_DIR . '/javascript/LeftAndMain.js'); Requirements::css(CMS_DIR . 'css/ImageEditor/ImageEditor.css'); diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 706b4632..7a0a840a 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -166,51 +166,51 @@ class LeftAndMain extends Controller { // Firebug is a useful console for debugging javascript // Its available as a Firefox extension or a javascript library // for easy inclusion in other browsers (just append ?debug_firebug=1 to the URL) - Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebug-lite-compressed.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/firebug-lite/firebug.js'); } else { // By default, we include fake-objects for all firebug calls // to avoid javascript errors when referencing console.log() etc in javascript code - Requirements::javascript(THIRDPARTY_DIR . '/firebug/firebugx.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/firebug-lite/firebugx.js'); } - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery-latest.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.datepicker.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.draggable.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.droppable.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.accordion.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/effects.core.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/effects.slide.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/effects.drop.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/effects.scale.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/layout/jquery.layout.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/fitheighttoparent/jquery.fitheighttoparent.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.datepicker.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.draggable.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.droppable.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.accordion.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.core.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.slide.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.drop.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/effects.scale.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-layout/jquery.layout.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-fitheighttoparent/jquery.fitheighttoparent.js'); Requirements::javascript(CMS_DIR . '/javascript/ssui.core.js'); // @todo Load separately so the CSS files can be inlined - Requirements::css(THIRDPARTY_DIR . '/jquery/themes/smoothness/ui.all.css'); + Requirements::css(SAPPHIRE_DIR . '/thirdparty/jquery-ui-themes/smoothness/ui.all.css'); // concrete - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/concrete/jquery.class.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/concrete/jquery.selector.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/concrete/jquery.selector.specifity.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/concrete/jquery.selector.matches.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/concrete/jquery.dat.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/concrete/jquery.concrete.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/jquery.class.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/jquery.selector.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/jquery.selector.specifity.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/jquery.selector.matches.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/jquery.dat.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-concrete/jquery.concrete.js'); - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-livequery/jquery.livequery.js'); Requirements::javascript(SAPPHIRE_DIR . '/javascript/core/jquery.ondemand.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/prototype_improvements.js'); Requirements::javascript(THIRDPARTY_DIR . '/loader.js'); Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang'); - Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); - Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/dragdrop.js'); - Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/controls.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/effects.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/dragdrop.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/controls.js'); Requirements::css(THIRDPARTY_DIR . '/greybox/greybox.css'); Requirements::javascript(THIRDPARTY_DIR . '/greybox/AmiJS.js'); @@ -248,15 +248,16 @@ class LeftAndMain extends Controller { Requirements::combine_files( 'assets/base.js', array( - 'jsparty/prototype.js', - 'jsparty/behaviour.js', - 'jsparty/prototype_improvements.js', - 'jsparty/jquery/jquery-latest.js', - 'jsparty/jquery/plugins/livequery/jquery.livequery.js', + 'sapphire/thirdparty/prototype.js', + 'sapphire/thirdparty/behaviour.js', + 'sapphire/javascript/prototype_improvements.js', + 'sapphire/thirdparty/jquery/jquery.js', + 'sapphire/thirdparty/jquery-livequery/jquery.livequery.js', 'jsparty/jquery/plugins/effen/jquery.fn.js', 'sapphire/javascript/core/jquery.ondemand.js', - 'jsparty/jquery/jquery_improvements.js', - 'jsparty/firebug/firebugx.js', + 'sapphire/javascript/jquery_improvements.js', + 'sapphire/jsparty/firebug-lite/firebug.js', + 'sapphire/jsparty/firebug-lite/firebugx.js', 'sapphire/javascript/i18n.js', ) ); @@ -265,9 +266,9 @@ class LeftAndMain extends Controller { 'assets/leftandmain.js', array( 'jsparty/loader.js', - 'jsparty/scriptaculous/effects.js', - 'jsparty/scriptaculous/dragdrop.js', - 'jsparty/scriptaculous/controls.js', + 'sapphire/thirdparty/scriptaculous/effects.js', + 'sapphire/thirdparty/scriptaculous/dragdrop.js', + 'sapphire/thirdparty/scriptaculous/controls.js', 'jsparty/greybox/AmiJS.js', 'jsparty/greybox/greybox.js', 'cms/javascript/LeftAndMain.js', @@ -275,7 +276,7 @@ class LeftAndMain extends Controller { 'cms/javascript/LeftAndMain_right.js', 'jsparty/tree/tree.js', 'cms/javascript/TinyMCEImageEnhancement.js', - 'sapphire/thirdparty/swfupload/SWFUpload.js', + 'sapphire/thirdparty/swfupload/swfupload.js', 'cms/javascript/Upload.js', 'cms/javascript/TinyMCEImageEnhancement.js', 'sapphire/javascript/TreeSelectorField.js', diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index 027dce0d..3989c219 100755 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -143,13 +143,13 @@ abstract class ModelAdmin extends LeftAndMain { Requirements::css(CMS_DIR . '/css/ModelAdmin.css'); // standard layout formatting for management UI Requirements::css(CMS_DIR . '/css/silverstripe.tabs.css'); // follows the jQuery UI theme conventions - Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/livequery/jquery.livequery.js'); - //Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.core.js'); - //Requirements::javascript(THIRDPARTY_DIR . '/jquery/ui/ui.tabs.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery/jquery.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-livequery/jquery.livequery.js'); + //Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.core.js'); + //Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/jquery-ui/ui.tabs.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/form/jquery.form.js'); Requirements::javascript(THIRDPARTY_DIR . '/jquery/plugins/effen/jquery.fn.js'); - Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery_improvements.js'); + Requirements::javascript(SAPPHIRE_DIR . '/javascript/jquery/jquery_improvements.js'); Requirements::javascript(CMS_DIR . '/javascript/ModelAdmin.js'); } diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php index add350fb..881a7ade 100644 --- a/code/SecurityAdmin.php +++ b/code/SecurityAdmin.php @@ -30,7 +30,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider { public function init() { parent::init(); - Requirements::javascript(THIRDPARTY_DIR . "/scriptaculous/controls.js"); + Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/scriptaculous/controls.js"); // needed for MemberTableField (Requirements not determined before Ajax-Call) Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang'); diff --git a/code/sitefeatures/PageCommentInterface.php b/code/sitefeatures/PageCommentInterface.php index c34d82bc..9b5772fb 100755 --- a/code/sitefeatures/PageCommentInterface.php +++ b/code/sitefeatures/PageCommentInterface.php @@ -188,9 +188,9 @@ class PageCommentInterface extends RequestHandler { // Shall We use AJAX? if(self::$use_ajax_commenting) { - Requirements::javascript(THIRDPARTY_DIR . '/behaviour.js'); - Requirements::javascript(THIRDPARTY_DIR . '/prototype.js'); - Requirements::javascript(THIRDPARTY_DIR . '/scriptaculous/effects.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/behaviour/behaviour.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/prototype/prototype.js'); + Requirements::javascript(SAPPHIRE_DIR . '/thirdparty/scriptaculous/effects.js'); Requirements::javascript(CMS_DIR . '/javascript/PageCommentInterface.js'); } diff --git a/javascript/Upload.js b/javascript/Upload.js index 88227c49..aa1f6c14 100644 --- a/javascript/Upload.js +++ b/javascript/Upload.js @@ -74,7 +74,7 @@ Upload.prototype = { button_window_mode : "transparent", button_width : this.buttonWidth, button_height : this.buttonHeight, - flash_url : 'jsparty/SWFUpload/swfupload.swf', // Relative to this file + flash_url : 'sapphire/thirdparty/swfupload/swfupload.swf', // Relative to this file swfupload_loaded_handler: this.buildUI.bind(this), debug: false, preserve_relative_urls: true diff --git a/javascript/tinymce_ssbuttons/editor_plugin_src.js b/javascript/tinymce_ssbuttons/editor_plugin_src.js index 8dafc823..9a188c94 100644 --- a/javascript/tinymce_ssbuttons/editor_plugin_src.js +++ b/javascript/tinymce_ssbuttons/editor_plugin_src.js @@ -113,5 +113,5 @@ // Adds the plugin class to the list of available TinyMCE plugins - tinymce.PluginManager.add("../../tinymce_ssbuttons", tinymce.plugins.SSButtons); + tinymce.PluginManager.add("../../../../cms/javascript/tinymce_ssbuttons", tinymce.plugins.SSButtons); })(); \ No newline at end of file diff --git a/javascript/tinymce_ssmacron/editor_plugin_src.js b/javascript/tinymce_ssmacron/editor_plugin_src.js index 2faef38c..c6e80dc3 100644 --- a/javascript/tinymce_ssmacron/editor_plugin_src.js +++ b/javascript/tinymce_ssmacron/editor_plugin_src.js @@ -36,5 +36,5 @@ }); // Adds the plugin class to the list of available TinyMCE plugins - tinymce.PluginManager.add("../../tinymce_ssmacron", tinymce.plugins.InsertMacron); + tinymce.PluginManager.add("../../../../cms/javascript/tinymce_ssmacron", tinymce.plugins.InsertMacron); })();