From 1925d5151ec41c293e37b5b2a51444cdbe0163d8 Mon Sep 17 00:00:00 2001
From: UndefinedOffset <echipman@webbuildersgroup.com>
Date: Fri, 27 Oct 2017 16:09:42 -0300
Subject: [PATCH] Revert "Moved to a vendor module #103"

This reverts commit 08a0781d564f4e5d971a70042e688d225251679c.
---
 .travis.yml                         | 2 +-
 composer.json                       | 9 ++-------
 src/Forms/GridFieldSortableRows.php | 6 +++---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 356ce6e..6b529b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,4 +19,4 @@ before_script:
   - cd ~/builds/ss
 
 script:
-  - vendor/bin/phpunit vendor/undefinedoffset/sortablegridfield/tests
\ No newline at end of file
+  - vendor/bin/phpunit sortablegridfield/tests
\ No newline at end of file
diff --git a/composer.json b/composer.json
index a3910c8..f60bc50 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "undefinedoffset/sortablegridfield",
 	"description": "Adds drag and drop functionality to SilverStripe 4.x's GridField",
-	"type": "silverstripe-vendormodule",
+	"type": "silverstripe-module",
 	"keywords": ["silverstripe", "gridfield"],
     "license": "BSD-3-Clause",
 	"authors": [
@@ -13,8 +13,7 @@
 	],
 	"require": {
 		"silverstripe/framework": "~4.0",
-		"silverstripe/versioned": "^1.0",
-        "silverstripe/vendor-plugin": "^1.0"
+		"silverstripe/versioned": "^1.0"
 	},
 	"autoload": {
 		"psr-4": {
@@ -27,10 +26,6 @@
 	},
 	"extra": {
 		"installer-name": "sortablegridfield",
-        "expose": [
-            "css",
-            "javascript"
-        ],
 		"branch-alias": {
 			"dev-master": "2.0.x-dev"
 		}
diff --git a/src/Forms/GridFieldSortableRows.php b/src/Forms/GridFieldSortableRows.php
index 357f2c7..eb57de0 100644
--- a/src/Forms/GridFieldSortableRows.php
+++ b/src/Forms/GridFieldSortableRows.php
@@ -25,7 +25,7 @@ use SilverStripe\ORM\SS_List;
 use SilverStripe\ORM\UnsavedRelationList;
 use SilverStripe\ORM\ValidationException;
 use SilverStripe\Versioned\Versioned;
-use SilverStripe\View\ArrayData;
+use SilverStripe\View\arrayData;
 use SilverStripe\View\Requirements;
 
 /**
@@ -132,8 +132,8 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
         $custom = Config::inst()->get(GridFieldSortableRows::class, 'Base');
         $base = $custom ?: SORTABLE_GRIDFIELD_BASE;
 
-        Requirements::css('undefinedoffset/sortablegridfield:css/GridFieldSortableRows.css');
-        Requirements::javascript('undefinedoffset/sortablegridfield:javascript/GridFieldSortableRows.js');
+        Requirements::css($base . '/css/GridFieldSortableRows.css');
+        Requirements::javascript($base . '/javascript/GridFieldSortableRows.js');
 
         $args = array('Colspan' => count($gridField->getColumns()), 'ID' => $gridField->ID(), 'DisableSelection' => $this->disable_selection);