MISC: JS coding standards.

silverstripe-terraformers · Mar 10, 2019 · f05957a · f05957a
1 parent 3b6dfd7
commit f05957a
Show file tree

Hide file tree

Showing 5 changed files with 2,169 additions and 61 deletions.
diff --git a/client/dist/js/embargo-expiry.js b/client/dist/js/embargo-expiry.js
diff --git a/client/dist/js/embargo-expiry.js.map b/client/dist/js/embargo-expiry.js.map
diff --git a/client/src/bundles/embargo-expiry.js b/client/src/bundles/embargo-expiry.js
@@ -6,23 +6,33 @@ window.jQuery.entwine('ss', ($) => {
   let versionedObjectPublishButton = null;
   let versionedObjectSaveButton = null;
 
-  const showHidePublishButton = (hasEmbargo) => {
+  const showHidePublishButtons = (hasEmbargo) => {
     if (hasEmbargo) {
-      if (siteTreePublishButton !== null) {
-        siteTreePublishButton.detach();
-      }
-
-      if (versionedObjectPublishButton !== null) {
-        versionedObjectPublishButton.detach();
-      }
-    } else {
-      if (siteTreePublishButton !== null) {
-        siteTreePublishButton.insertAfter(siteTreeSaveButton);
-      }
-
-      if (versionedObjectPublishButton !== null) {
-        versionedObjectPublishButton.insertAfter(versionedObjectSaveButton);
-      }
+      hidePublishButton();
+
+      return;
+    }
+
+    showPublishButton();
+  };
+
+  const hidePublishButton = () => {
+    if (siteTreePublishButton !== null) {
+      siteTreePublishButton.detach();
+    }
+
+    if (versionedObjectPublishButton !== null) {
+      versionedObjectPublishButton.detach();
+    }
+  };
+
+  const showPublishButton = () => {
+    if (siteTreePublishButton !== null) {
+      siteTreePublishButton.insertAfter(siteTreeSaveButton);
+    }
+
+    if (versionedObjectPublishButton !== null) {
+      versionedObjectPublishButton.insertAfter(versionedObjectSaveButton);
     }
   };
 
@@ -34,10 +44,10 @@ window.jQuery.entwine('ss', ($) => {
       versionedObjectPublishButton = $('button[name="action_doPublish"]');
       versionedObjectSaveButton = $('button[name="action_doSave"]');
 
-      showHidePublishButton($(this).val().length > 0);
+      showHidePublishButtons($(this).val().length > 0);
     },
     onchange() {
-      showHidePublishButton($(this).val().length > 0);
+      showHidePublishButtons($(this).val().length > 0);
     },
   });
 });
diff --git a/package.json b/package.json
@@ -30,7 +30,8 @@
   },
   "homepage": "https://github.com/silverstripe-terraformers/silverstripe-embargo-expiry",
   "devDependencies": {
-    "@silverstripe/webpack-config": "^0.4.1"
+    "@silverstripe/eslint-config": "0.0.5",
+    "@silverstripe/webpack-config": "^0.11.0"
   },
   "dependencies": {
     "jquery": "^3.2.1"