FIX entwine

composer.json

@@ -28,7 +28,7 @@
       "dev-master": "1.0.x-dev"
     },
     "expose": [
-      "js"
+      "dist"
     ]
   },
   "minimum-stability": "dev",

js/bitly.js

@@ -1,27 +1,34 @@
-var Vulcan = {
-    Bitly: {
-        initEvents: function () {
-            var _this = this;
+jQuery.entwine('ss', function ($) {
+    jQuery('#bitlyCopyUrl').entwine({
+        onclick: function () {
+            var url = jQuery(this).attr('data-href');
+            Vulcan.Bitly.copyUrl(url);
+        }
+    });
 
-            jQuery('#bitlyCopyUrl').on('click', function () {
-                var url = jQuery(this).attr('data-href');
-                _this.copyUrl(url);
-            });
+    jQuery('.bitly-field').entwine({
+        onmatch: function () {
+            var $desc = jQuery('.field.urlsegment .edit-holder .form__field-description').clone();
+            $desc.html("<strong>Warning</strong>: Changing your URL segment will force your Bitly URL to update and unfortunately the click count will reset as Bitly does not allow you to edit links.");
+            jQuery('.field.urlsegment .edit-holder').append($desc);
+        }
+    });
 
-            jQuery('.field.urlsegment .update').on('click', function () {
-                jQuery('#Form_EditForm_BitlyURL_Holder').find('.preview-holder').html("<div style='margin-top: 8px;'>URL segment has changed, waiting for you to save.</div>")
-            });
+    jQuery('.field.urlsegment .update').entwine({
+        onclick: function () {
+            jQuery('#Form_EditForm_BitlyURL_Holder').find('.preview-holder').html("<div style='margin-top: 8px;'>URL segment has changed, waiting for you to save.</div>")
+        }
+    });
 
-            if (jQuery('.bitly-field').length > 0) {
-                var $desc = jQuery('.field.urlsegment .edit-holder .form__field-description').clone();
-                $desc.html("<strong>Warning</strong>: Changing your URL segment will force your Bitly URL to update and unfortunately the click count will reset as Bitly does not allow you to edit links.");
-                jQuery('.field.urlsegment .edit-holder').append($desc);
-            }
+    jQuery('#bitlyRefresh').entwine({
+        onclick: function () {
+            Vulcan.Bitly.updateClicks();
+        }
+    });
+});
 
-            jQuery('#bitlyRefresh').on('click', function () {
-                _this.updateClicks();
-            });
-        },
+var Vulcan = {
+    Bitly: {
         copyUrl: function (url) {
             var input = document.createElement('input');
             input.setAttribute('value', url);
@@ -53,6 +60,4 @@ var Vulcan = {
             })
         }
     }
-};
-
-Vulcan.Bitly.initEvents();
+};

src/Forms/BitlyField.php

@@ -37,7 +37,7 @@ class BitlyField extends ReadonlyField
      */
     public function __construct($name, $title = null, $value = null, BitlyUrl $record)
     {
-        Requirements::javascript('vulcandigital/silverstripe-bitly:js/bitly.min.js');
+        Requirements::javascript('vulcandigital/silverstripe-bitly:dist/js/bitly.min.js');
         $this->setBitly($record);
 
         parent::__construct($name, $title, $value);