tonyair/silverstripe-widgets
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-widgets synced 2024-10-22 15:05:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #156 from creative-commoners/pulls/2.0/vendorise

Browse Source 
NEW Install module to the vendor folder
This commit is contained in:
Damian Mooyman 2017-10-11 11:51:36 +13:00 committed by GitHub
commit 023eef23c6
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
composer.json
View File

@ -10,8 +10,9 @@
} }
], ],
"require": { "require": {
"silverstripe/framework": "^4.0@dev", "silverstripe/vendor-plugin": "^1.0",
"silverstripe/cms": "^4.0@dev" "silverstripe/framework": "^4.0",
"silverstripe/cms": "^4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7", "phpunit/phpunit": "^5.7",
@ -20,7 +21,11 @@
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.x-dev" "dev-master": "2.x-dev"
} },
"expose": [
"css",
"javascript"
]
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

6
src/Forms/WidgetAreaEditor.php
View File

@ -11,7 +11,6 @@ use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataObjectInterface; use SilverStripe\ORM\DataObjectInterface;
use SilverStripe\Widgets\Forms\WidgetAreaEditor; use SilverStripe\Widgets\Forms\WidgetAreaEditor;
use SilverStripe\Widgets\Model\Widget; use SilverStripe\Widgets\Model\Widget;
use SilverStripe\View\Requirements;
/** /**
* Special field type for selecting and configuring widgets on a page. * Special field type for selecting and configuring widgets on a page.
@ -40,9 +39,8 @@ class WidgetAreaEditor extends FormField
*/ */
public function FieldHolder($properties = array()) public function FieldHolder($properties = array())
{ {
$module = ModuleLoader::getModule('silverstripe/widgets'); Requirements::css('silverstripe/widgets:css/WidgetAreaEditor.css');
Requirements::css($module->getRelativeResourcePath('css/WidgetAreaEditor.css')); Requirements::javascript('silverstripe/widgets:javascript/WidgetAreaEditor.js');
Requirements::javascript($module->getRelativeResourcePath('javascript/WidgetAreaEditor.js'));
return $this->renderWith(WidgetAreaEditor::class); return $this->renderWith(WidgetAreaEditor::class);
} }