refactoring code

Author: lgfa29

77-cloudant-cf.html

@@ -88,7 +88,6 @@
 </script>
 
 <script type="text/x-red" data-template-name="cloudant out">
-
     <div class="form-row">
         <label for="node-input-service"><i class="fa fa-folder-close"></i> Service</label>
         <select id="node-input-service">
@@ -136,7 +135,77 @@
             else $(".node-input-payonly").show();
         });
     </script>
+</script>
 
+<script type="text/javascript">
+    RED.nodes.registerType("cloudant out", {
+        category: "storage-output",
+        color: "rgb(114, 199, 231)",
+        defaults: {
+            service: { value: "", required: true },
+            cloudant: { type: "cloudant", validate: validateServer},
+            name: { value: "" },
+            database: { value: "", required: true },
+            payonly: { value: false },
+            operation: { value: "insert" }
+        },
+        inputs: 1,
+        outputs: 0,
+        icon: "cloudant.png",
+        align: "right",
+        label: label,
+        labelStyle: function() {
+            return this.name?"node_label_italic":"";
+        },
+        oneditprepare: oneditprepare
+    });
+
+    function oneditprepare() {
+        var select = $('#node-input-service');
+        var node = this;
+
+        $.getJSON('cloudant/vcap/',function(data) {
+            var last = select.children().last();
+            var opts = [];
+
+            for (var i=0; i < data.length; i++) {
+                var selected = node.service == data[i].name;
+                opts.push(
+                    '<option value="' + data[i].name + '"' + (selected ? " selected":"") + '>' +
+                        data[i].name +
+                    '</option>'
+                );
+            }
+
+            if (opts.length == 0) {
+                node.service = "_ext_";
+                select.find("option").filter(function() {
+                    return $(this).val() == node.service;
+                }).attr('selected', true);
+            } else {
+                last.before(opts.join(""));
+            }
+
+            select.change();
+        });
+
+        select.change(function() {
+            var service = select.val();
+            if (service == "_ext_") {
+                $("#node-input-external-details").show();
+            } else {
+                $("#node-input-external-details").hide();
+            }
+        });
+    }
+
+    function label() {
+        return this.name || this.database || "cloudant";
+    }
+
+    function validateServer(v) {
+        return this.service != "_ext_" || v != "_ADD_";
+    }
 </script>
 
 <script type="text/x-red" data-help-name="cloudant out">
@@ -159,77 +228,3 @@
         and selecting the <b>remove</b> option for the node.
     </p>
 </script>
-
-<script type="text/javascript"> //js functions
-    (function() {
-
-        function oneditprepare() {
-            var select = $('#node-input-service');
-            var node = this;
-
-            $.getJSON('cloudant/vcap/',function(data) {
-                var last = select.children().last();
-                var opts = [];
-
-                for (var i=0; i < data.length; i++) {
-                    var selected = node.service == data[i].name;
-                    opts.push(
-                        '<option value="' + data[i].name + '"' + (selected ? " selected":"") + '>' +
-                            data[i].name +
-                        '</option>'
-                    );
-                }
-
-                if (opts.length == 0) {
-                    node.service = "_ext_";
-                    select.find("option").filter(function() {
-                        return $(this).val() == node.service;
-                    }).attr('selected', true);
-                } else {
-                    last.before(opts.join(""));
-                }
-
-                select.change();
-            });
-
-            select.change(function() {
-                var service = select.val();
-                if (service == "_ext_") {
-                    $("#node-input-external-details").show();
-                } else {
-                    $("#node-input-external-details").hide();
-                }
-            });
-        }
-
-        function label() {
-            return this.name || this.database || "cloudant";
-        }
-
-        function validateServer(v) {
-            return this.service != "_ext_" || v != "_ADD_";
-        }
-
-        RED.nodes.registerType("cloudant out", {
-            category: "storage-output",
-            color: "rgb(114, 199, 231)",
-            defaults: {
-                service: { value: "", required: true },
-                cloudant: { type: "cloudant", validate: validateServer},
-                name: { value: "" },
-                database: { value: "", required: true },
-                payonly: { value: false },
-                operation: { value: "insert" }
-            },
-            inputs: 1,
-            outputs: 0,
-            icon: "cloudant.png",
-            align: "right",
-            label: label,
-            labelStyle: function() {
-                return this.name?"node_label_italic":"";
-            },
-            oneditprepare: oneditprepare
-        });
-    })();
-</script>