Permalink
Browse files

Merge remote-tracking branch 'lrcremote/bug-fix'

  • Loading branch information...
2 parents d76ab46 + 62e171a commit 1d4952925386ca7bbc48ce9c8855d538ee2d5b76 @UndefinedOffset committed Oct 13, 2012
Showing with 35 additions and 38 deletions.
  1. +29 −29 .project
  2. +3 −3 .settings/org.eclipse.php.core.prefs
  3. +1 −4 _config.php
  4. +2 −2 code/forms/GridFieldSortableRows.php
View
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>
View
6 .settings/org.eclipse.php.core.prefs
@@ -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
View
5 _config.php
@@ -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__)));
?>
View
4 code/forms/GridFieldSortableRows.php
@@ -73,8 +73,8 @@ public function getHTMLFragments($gridField) {
//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());

0 comments on commit 1d49529

Please sign in to comment.