From 31e783287562ab6884b7c61298e4ad97274725e3 Mon Sep 17 00:00:00 2001
From: scott1702 <scott@silverstripe.com>
Date: Tue, 12 Jan 2016 12:45:59 +1300
Subject: [PATCH] Update paths in AssetAdmin.php

---
 code/controllers/AssetAdmin.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php
index 8fd862ac..2a811b95 100644
--- a/code/controllers/AssetAdmin.php
+++ b/code/controllers/AssetAdmin.php
@@ -68,17 +68,6 @@ class AssetAdmin extends LeftAndMain implements PermissionProvider{
 		Requirements::javascript(CMS_DIR . '/javascript/CMSMain.GridField.js');
 		Requirements::add_i18n_javascript(CMS_DIR . '/javascript/lang', false, true);
 		Requirements::css(CMS_DIR . "/css/screen.css");
-		$frameworkDir = FRAMEWORK_DIR;
-		Requirements::customScript(<<<JS
-			_TREE_ICONS = {};
-			_TREE_ICONS['Folder'] = {
-					fileIcon: '$frameworkDir/javascript/tree/images/page-closedfolder.gif',
-					openFolderIcon: '$frameworkDir/javascript/tree/images/page-openfolder.gif',
-					closedFolderIcon: '$frameworkDir/javascript/tree/images/page-closedfolder.gif'
-			};
-JS
-		);
-
 		CMSBatchActionHandler::register('delete', 'AssetAdmin_DeleteBatchAction', 'Folder');
 	}
 
@@ -147,7 +136,7 @@ JS
 	}
 
 	public function getEditForm($id = null, $fields = null) {
-		Requirements::javascript(FRAMEWORK_DIR . '/javascript/AssetUploadField.js');
+		Requirements::javascript(FRAMEWORK_DIR . '/javascript/dist/AssetUploadField.js');
 		Requirements::css(FRAMEWORK_DIR . '/css/AssetUploadField.css');
 
 		$form = parent::getEditForm($id, $fields);