mirror of
https://github.com/UndefinedOffset/SortableGridField.git
synced 2024-10-22 17:05:38 +02:00
Merge remote-tracking branch 'lrcremote/bug-fix'
This commit is contained in:
commit
1d49529253
58
.project
58
.project
@ -1,29 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>Website SilverStripe (SortableGridField)</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.dltk.core.scriptbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>ca.edchipman.silverstripepdt.SilverStripeNature</nature>
|
||||
<nature>org.eclipse.php.core.PHPNature</nature>
|
||||
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>Website SilverStripe (SortableGridField)</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.wst.validation.validationbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.dltk.core.scriptbuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>ca.edchipman.silverstripepdt.SilverStripeNature</nature>
|
||||
<nature>org.eclipse.php.core.PHPNature</nature>
|
||||
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
@ -1,3 +1,3 @@
|
||||
eclipse.preferences.version=1
|
||||
include_path=0;/SortableGridField\u00055;ca.edchipman.silverstripepdt.LANGUAGE
|
||||
silverstripe_version=SS3.0
|
||||
eclipse.preferences.version=1
|
||||
include_path=0;/SortableGridField\u00055;ca.edchipman.silverstripepdt.LANGUAGE
|
||||
silverstripe_version=SS3.0
|
||||
|
@ -1,6 +1,3 @@
|
||||
<?php
|
||||
$dir=basename(dirname(__FILE__));
|
||||
if($dir!='SortableGridField') {
|
||||
user_error('SortableGridField: Directory name must be "SortableGridField" (currently "'.$dir.'")',E_USER_ERROR);
|
||||
}
|
||||
define('SORTABLE_GRIDFIELD_BASE', Director::absoluteBaseURL() . basename(dirname(__FILE__)));
|
||||
?>
|
@ -73,8 +73,8 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
|
||||
|
||||
|
||||
//Inject Requirements
|
||||
Requirements::css('SortableGridField/css/GridFieldSortableRows.css');
|
||||
Requirements::javascript('SortableGridField/javascript/GridFieldSortableRows.js');
|
||||
Requirements::css(SORTABLE_GRIDFIELD_BASE . '/css/GridFieldSortableRows.css');
|
||||
Requirements::javascript(SORTABLE_GRIDFIELD_BASE . '/javascript/GridFieldSortableRows.js');
|
||||
|
||||
|
||||
$args = array('Colspan' => count($gridField->getColumns()), 'ID' => $gridField->ID());
|
||||
|
Loading…
Reference in New Issue
Block a user