From 43713c9fb897cf7320b93aed878c40ddac6ac12a Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Mon, 10 Mar 2014 14:08:28 +0000 Subject: [PATCH] Update ckeditor to 4.3.2 Create define for the ckeditor path --- Toolkit/Blocks/Admin/EditPage.php | 2 +- Toolkit/Toolbox/Forms/EditPage.php | 2 +- Toolkit/Toolbox/Forms/EditParagraph.php | 2 +- setup.phtml | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Toolkit/Blocks/Admin/EditPage.php b/Toolkit/Blocks/Admin/EditPage.php index e18b9b9..e8f7271 100644 --- a/Toolkit/Blocks/Admin/EditPage.php +++ b/Toolkit/Blocks/Admin/EditPage.php @@ -119,7 +119,7 @@ class Toolkit_Blocks_Admin_EditPage public function toHtml() { $GLOBALS['bottomScripts'][] - = MEDIA_APP_BASE_URL . 'ckeditor/current/ckeditor.js'; + = CKEDITOR_JS . ''; $GLOBALS['bottomScripts'][] = $this->_routerPath . '/js/editPage.js'; if ($_GET['blockId'] && $_REQUEST['Command'] == 'Delete') { diff --git a/Toolkit/Toolbox/Forms/EditPage.php b/Toolkit/Toolbox/Forms/EditPage.php index 56fc850..bf71c5a 100644 --- a/Toolkit/Toolbox/Forms/EditPage.php +++ b/Toolkit/Toolbox/Forms/EditPage.php @@ -1136,7 +1136,7 @@ class Toolkit_Toolbox_Forms_EditPage $GLOBALS['topScripts'][] = MEDIA_APP_BASE_URL . 'libjs/jquery/jquery-1.4.2.min.js'; $GLOBALS['bottomScripts'][] - = MEDIA_APP_BASE_URL . 'ckeditor/current/ckeditor.js'; + = CKEDITOR_JS . ''; $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/plugins/asmselect/1.0.4a/jquery.asmselect.js'; $GLOBALS['bottomScripts'][] diff --git a/Toolkit/Toolbox/Forms/EditParagraph.php b/Toolkit/Toolbox/Forms/EditParagraph.php index 528f5e1..7710c3e 100644 --- a/Toolkit/Toolbox/Forms/EditParagraph.php +++ b/Toolkit/Toolbox/Forms/EditParagraph.php @@ -475,7 +475,7 @@ class Toolkit_Toolbox_Forms_EditParagraph extends Toolkit_FormBuilder $GLOBALS['topScripts'][] = MEDIA_APP_BASE_URL . 'libjs/jquery/jquery-1.4.2.min.js'; $GLOBALS['bottomScripts'][] - = MEDIA_APP_BASE_URL . 'ckeditor/current/ckeditor.js'; + = CKEDITOR_JS . ''; $GLOBALS['bottomScripts'][] = MEDIA_APP_BASE_URL . 'libjs/plugins/ajaxUpload/3.9/ajaxupload.js'; $GLOBALS['bottomScripts'][] diff --git a/setup.phtml b/setup.phtml index 5ee4816..169791b 100644 --- a/setup.phtml +++ b/setup.phtml @@ -621,6 +621,7 @@ $mediaAppBaseUrl ? GLM_APP_BASE_SECURE_URL : GLM_APP_BASE_URL; define('MEDIA_APP_BASE_URL', $mediaAppBaseUrl); +define('CKEDITOR_JS', MEDIA_APP_BASE_URL . 'ckeditor/4.3.2/ckeditor.js'); // This needs to be set to the real url ie. http://demo.gaslightmedia.com if ($isSecurePage) { $BASE_URL = "http://$base_url"; -- 2.17.1