From d59b2ad5cfc8705127a07d8e1e58e900f05bd376 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Fri, 13 Nov 2009 02:51:25 +0000 Subject: [PATCH] BUGFIX: fixed order inclusion of js git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@91542 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/LeftAndMain.php | 2 +- javascript/Upload.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 1f0590da..0ce67833 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -253,9 +253,9 @@ class LeftAndMain extends Controller { 'cms/javascript/LeftAndMain_right.js', 'jsparty/tree/tree.js', 'jsparty/tabstrip/tabstrip.js', - 'cms/javascript/TinyMCEImageEnhancement.js', 'jsparty/SWFUpload/swfupload.js', 'cms/javascript/Upload.js', + 'cms/javascript/TinyMCEImageEnhancement.js', 'sapphire/javascript/TreeSelectorField.js', 'cms/javascript/ThumbnailStripField.js', ) diff --git a/javascript/Upload.js b/javascript/Upload.js index 88227c49..578ed88e 100644 --- a/javascript/Upload.js +++ b/javascript/Upload.js @@ -76,7 +76,7 @@ Upload.prototype = { button_height : this.buttonHeight, flash_url : 'jsparty/SWFUpload/swfupload.swf', // Relative to this file swfupload_loaded_handler: this.buildUI.bind(this), - debug: false, + debug: true, preserve_relative_urls: true });