Merge pull request #1 from silverstripe-superchargers/bugfix/exposefix

Andrew Dunn · web-flow · commit 771be8c174cf · 2018-12-21T10:01:30.000+13:00
ss4upgrade: Fixed loading of resources in CMS
diff --git a/composer.json b/composer.json
@@ -11,8 +11,10 @@
 		"silverstripe/framework": "^4",
 		"silverstripe/cms": "^4"
 	},
-    "expose": [
-        "css",
-        "javascript"
-    ]
+    "extra": {
+        "expose": [
+            "css",
+            "javascript"
+        ]
+    }
 }
diff --git a/javascript/ImageSelect.jquery.js b/javascript/ImageSelect.jquery.js
@@ -185,7 +185,11 @@
                     }
                 });
             });
-            this.trigger('chosen:hiding_dropdown');
+
+            if (typeof $this !== 'undefined') {
+                $this.trigger('chosen:hiding_dropdown');
+            }
+
             return ret;
         }
     });

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,11 @@`
`185`	`185`	`}`
`186`	`186`	`});`
`187`	`187`	`});`
`188`		`- this.trigger('chosen:hiding_dropdown');`
	`188`	`+`
	`189`	`+ if (typeof $this !== 'undefined') {`
	`190`	`+ $this.trigger('chosen:hiding_dropdown');`
	`191`	`+ }`
	`192`	`+`
`189`	`193`	`return ret;`
`190`	`194`	`}`
`191`	`195`	`});`