Permalink
Browse files

BUGFIX Removed LeftAndMain.js requirement from AssetAdmin->uploadIfra…

…me(), unclear why its needed, and it breaks due to missing jquery/concrete dependencies

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92784 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent 97f7476 commit 9504fc1d57cf5493fe099deb21251946d9334c87 @chillu chillu committed Nov 21, 2009
Showing with 2 additions and 2 deletions.
  1. +2 −2 code/AssetAdmin.php
View
@@ -113,8 +113,8 @@ function uploadiframe() {
Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/prototype/prototype.js");
Requirements::javascript(SAPPHIRE_DIR . "/thirdparty/behaviour/behaviour.js");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
- Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
- Requirements::javascript(THIRDPARTY_DIR . "/multifile/multifile.js");
+ //Requirements::javascript(CMS_DIR . "/javascript/LeftAndMain.js");
+ Requirements::javascript(CMS_DIR . "/thirdparty/multifile/multifile.js");
Requirements::css(THIRDPARTY_DIR . "/multifile/multifile.css");
Requirements::css(CMS_DIR . "/css/typography.css");
Requirements::css(CMS_DIR . "/css/layout.css");

0 comments on commit 9504fc1

Please sign in to comment.