SS4 upgrade.

sheadawson · Nov 29, 2017 · 3408d12 · 3408d12
1 parent b4e91ec
commit 3408d12
Show file tree

Hide file tree

Showing 20 changed files with 945 additions and 648 deletions.
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -66,4 +66,4 @@ checks:
     argument_type_checks: true
 
 filter:
-  paths: [code/*, tests/*]
+  paths: [src/*, tests/*]
diff --git a/.upgrade.yml b/.upgrade.yml
@@ -0,0 +1,7 @@
+mappings:
+  LinkableDataExtension: Sheadawson\Linkable\Extensions\LinkableDataExtension
+  LinkableSiteTreeExtension: Sheadawson\Linkable\Extensions\LinkableSiteTreeExtension
+  EmbeddedObjectField: Sheadawson\Linkable\Forms\EmbeddedObjectField
+  LinkField: Sheadawson\Linkable\Extensions\Forms\LinkField
+  EmbeddedObject: Sheadawson\Linkable\Models\EmbeddedObject
+  Link: Sheadawson\Linkable\Models\Link
diff --git a/_config.php b/_config.php
@@ -1,3 +1 @@
 <?php
-
-if(!defined('LINKABLE_PATH')) define('LINKABLE_PATH', rtrim(basename(dirname(__FILE__))));
diff --git a/_config/linkable.yml b/_config/linkable.yml
@@ -2,14 +2,15 @@
 Name: linkable
 After:
   - 'framework/*'
-  - 'cms/*'
+#  - 'cms/*'
+# TODO fix this, for some reason this rule breaks the dev build task
 Only:
-  moduleexists: 'cms'
+  moduleexists: 'silverstripe/cms'
 ---
-Link:
+Sheadawson\Linkable\Models\Link:
   extensions:
-    - LinkableSiteTreeExtension
-    
+    - Sheadawson\Linkable\Extensions\LinkableSiteTreeExtension
+
 Page:
   extensions:
-    - LinkableDataExtension
+    - Sheadawson\Linkable\Extensions\LinkableDataExtension
diff --git a/css/embeddedobjectfield.css → client/css/embeddedobjectfield.css b/css/embeddedobjectfield.css → client/css/embeddedobjectfield.css
diff --git a/javascript/embeddedobjectfield.js → client/javascript/embeddedobjectfield.js b/javascript/embeddedobjectfield.js → client/javascript/embeddedobjectfield.js
diff --git a/javascript/linkfield.js → client/javascript/linkfield.js b/javascript/linkfield.js → client/javascript/linkfield.js
@@ -56,6 +56,7 @@ jQuery.entwine("linkfield", function($) {
 						form.addClass('changed');
 					} else {
 						self.getDialog().html(response);
+                        jQuery('div.display-logic, div.display-logic-master').entwine().initFields();
 					}
 				}
 
@@ -77,6 +78,9 @@ jQuery.entwine("linkfield", function($) {
 			dlg.empty().dialog("open").parent().addClass("loading");
 
 			dlg.load(this.getURL(), function(){
+			    // init display logic fields
+                jQuery('div.display-logic, div.display-logic-master').entwine().initFields();
+
 				dlg.parent().removeClass("loading");
 			});
 		}
@@ -103,8 +107,9 @@ jQuery.entwine("linkfield", function($) {
 			var holder = this.parents('.field:first');
 			this.parents('.middleColumn:first').html("<img src='framework/images/network-save.gif' />");
 			holder.load(url, function() {
-				 form.addClass('changed');
-			});
+                form.addClass('changed');
+                holder.replaceWith(holder.html());
+            });
 
 			return false;
 		},