tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 11:05:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #483 from creative-commoners/pulls/2.5/behat

Browse Source 
FIX Move files to client directory
This commit is contained in:
Guy Sartorelli 2022-07-20 09:43:37 +12:00 committed by GitHub
commit b9d972b7fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
css/LeftAndMain_Subsites.css → client/css/LeftAndMain_Subsites.css
View File

0
javascript/LeftAndMain_Subsites.js → client/javascript/LeftAndMain_Subsites.js
View File

0
javascript/SubsitesTreeDropdownField.js → client/javascript/SubsitesTreeDropdownField.js
View File

0
javascript/VirtualPage_Subsites.js → client/javascript/VirtualPage_Subsites.js
View File

4
composer.json
View File

@ -38,8 +38,8 @@
"dev-master": "2.x-dev" "dev-master": "2.x-dev"
}, },
"expose": [ "expose": [
"javascript", "client/javascript",
"css" "client/css"
] ]
}, },
"minimum-stability": "dev", "minimum-stability": "dev",

8
src/Extensions/LeftAndMainSubsites.php
View File

@ -41,9 +41,9 @@ class LeftAndMainSubsites extends LeftAndMainExtension
public function init() public function init()
{ {
Requirements::css('silverstripe/subsites:css/LeftAndMain_Subsites.css'); Requirements::css('silverstripe/subsites:client/css/LeftAndMain_Subsites.css');
Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js'); Requirements::javascript('silverstripe/subsites:client/javascript/LeftAndMain_Subsites.js');
Requirements::javascript('silverstripe/subsites:javascript/VirtualPage_Subsites.js'); Requirements::javascript('silverstripe/subsites:client/javascript/VirtualPage_Subsites.js');
} }
/** /**
@ -150,7 +150,7 @@ class LeftAndMainSubsites extends LeftAndMainExtension
return false; return false;
} }
Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js'); Requirements::javascript('silverstripe/subsites:client/javascript/LeftAndMain_Subsites.js');
$output = ArrayList::create(); $output = ArrayList::create();

2
src/Forms/SubsitesTreeDropdownField.php
View File

@ -38,7 +38,7 @@ class SubsitesTreeDropdownField extends TreeDropdownField
{ {
$html = parent::Field($properties); $html = parent::Field($properties);
Requirements::javascript('silverstripe/subsites:javascript/SubsitesTreeDropdownField.js'); Requirements::javascript('silverstripe/subsites:client/javascript/SubsitesTreeDropdownField.js');
return $html; return $html;
} }