Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX Move files to client directory #483

Merged
merged 1 commit into from
Jul 19, 2022
+7 −7
Merged

FIX Move files to client directory #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 css/LeftAndMain_Subsites.css → client/css/LeftAndMain_Subsites.css
View file
Open in desktop
File renamed without changes.
0 javascript/LeftAndMain_Subsites.js → client/javascript/LeftAndMain_Subsites.js
View file
Open in desktop
File renamed without changes.
0 javascript/SubsitesTreeDropdownField.js → ...t/javascript/SubsitesTreeDropdownField.js
View file
Open in desktop
File renamed without changes.
0 javascript/VirtualPage_Subsites.js → client/javascript/VirtualPage_Subsites.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"dev-master": "2.x-dev"
},
"expose": [
"javascript",
"css"
"client/javascript",
"client/css"
]
},
"minimum-stability": "dev",
Expand Down
8 changes: 4 additions & 4 deletions src/Extensions/LeftAndMainSubsites.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class LeftAndMainSubsites extends LeftAndMainExtension

public function init()
{
Requirements::css('silverstripe/subsites:css/LeftAndMain_Subsites.css');
Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js');
Requirements::javascript('silverstripe/subsites:javascript/VirtualPage_Subsites.js');
Requirements::css('silverstripe/subsites:client/css/LeftAndMain_Subsites.css');
Requirements::javascript('silverstripe/subsites:client/javascript/LeftAndMain_Subsites.js');
Requirements::javascript('silverstripe/subsites:client/javascript/VirtualPage_Subsites.js');
}

/**
Expand Down Expand Up @@ -150,7 +150,7 @@ public function ListSubsites()
return false;
}

Requirements::javascript('silverstripe/subsites:javascript/LeftAndMain_Subsites.js');
Requirements::javascript('silverstripe/subsites:client/javascript/LeftAndMain_Subsites.js');

$output = ArrayList::create();

Expand Down
2 changes: 1 addition & 1 deletion src/Forms/SubsitesTreeDropdownField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function Field($properties = [])
{
$html = parent::Field($properties);

Requirements::javascript('silverstripe/subsites:javascript/SubsitesTreeDropdownField.js');
Requirements::javascript('silverstripe/subsites:client/javascript/SubsitesTreeDropdownField.js');

return $html;
}
Expand Down