formstrap 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9036a76a91e170b7fb332d006940db1273770254f9d26c090365c512ce0e0c16
-  data.tar.gz: 22433a20c6970ddcee18a5df637cc7a4506bc77d4516e73b3c39cc76af3026ab
+  metadata.gz: '0379b9b80ad9551b56d07884264fcc37132b72d5539976ec4034800a09adaeb2'
+  data.tar.gz: bbd8d0892fce51fa07375b3e6a414e169344825f5da142c5a06ab87a7696424b
 SHA512:
-  metadata.gz: 733e8dc5350e55ae59df878de51daa8da355159eeccb7875ff5d9c0bfa19fafa7fc6019ed6e8779eca09a07a3657e451145f5e2c98d6f53e3bf91118ccda24d4
-  data.tar.gz: 3c39838520f7dc0d62bc010ca159e91c6df28e179c505c825362d50c941a9b972fb1845657352466e59517d3c903a27a9b86b60769392e4af7d77350c0e6d8ea
+  metadata.gz: '0788d10916489c6fabe8798a87ffa10a75d46a4e57a2cd8c73455cc64630414ebbdbcfe213041437b22d108df2a3fa986e3692e8ea46ba25fdc28bb068142a42'
+  data.tar.gz: 3fba876a0ce0c7be868100726d60af6b1b5aae1b8af675e4861b9ba016405920b1ff35f537a12ce9aa10865fb1e599662170446d999a9bc6e69752f9cf2dc252

data/app/assets/javascripts/formstrap/controllers/select_controller.js

@@ -6,7 +6,7 @@ export default class extends Controller {
   static values = {
     selected: Array
   }
-  
+
   connect () {
     if (this.element.hasAttribute('multiple') || this.element.dataset.tomSelect === 'true') {
       this.initTomSelect()
@@ -49,7 +49,7 @@ export default class extends Controller {
 
   initTomSelect () {
     const defaultOptions = this.defaultOptions()
-    const options = { 
+    const options = {
       create: this.hasTags(),
       items: this.selectedValue
     }

data/app/assets/javascripts/formstrap/vendor/redactor/plugins/linkstyles.js

@@ -31,11 +31,13 @@ Redactor.add('plugin', 'linkstyles', {
       }
     },
     'link.change': function (e) {
-      const link = e.params.element.nodes[0]
+      let link = e.params.element.nodes[0]
+      link = this.ensureValidProtocol(link)
       this.applyStylingToLink(link)
     },
     'link.add': function (e) {
-      const link = e.params.element.nodes[0]
+      let link = e.params.element.nodes[0]
+      link = this.ensureValidProtocol(link)
       this.applyStylingToLink(link)
     }
   },
@@ -47,6 +49,7 @@ Redactor.add('plugin', 'linkstyles', {
     const stack = this.app.modal.getStack()
 
     const item = stack.getFormItem('url')
+
     const box = this.dom('<div>').addClass('rx-form-item')
 
     // Add a select
@@ -69,6 +72,18 @@ Redactor.add('plugin', 'linkstyles', {
       link.classList.add(className)
     })
   },
+  ensureValidProtocol (link) {
+    let url = link.getAttribute('href')
+
+    // Match valid protocols
+    const regex = /^(https?:\/\/|mailto:|ftp:\/\/)/i
+    if (!regex.test(url)) {
+      url = `https://${url}`
+    }
+
+    link.setAttribute('href', url)
+    return link
+  },
   buildSelect () {
     // Create a select node
     const select = this.dom('<select>').addClass('rx-form-select')

data/app/assets/javascripts/formstrap.js

@@ -14462,11 +14462,13 @@ Redactor.add("plugin", "linkstyles", {
       }
     },
     "link.change": function(e) {
-      const link = e.params.element.nodes[0];
+      let link = e.params.element.nodes[0];
+      link = this.ensureValidProtocol(link);
       this.applyStylingToLink(link);
     },
     "link.add": function(e) {
-      const link = e.params.element.nodes[0];
+      let link = e.params.element.nodes[0];
+      link = this.ensureValidProtocol(link);
       this.applyStylingToLink(link);
     }
   },
@@ -14490,6 +14492,15 @@ Redactor.add("plugin", "linkstyles", {
       link.classList.add(className);
     });
   },
+  ensureValidProtocol(link) {
+    let url = link.getAttribute("href");
+    const regex = /^(https?:\/\/|mailto:|ftp:\/\/)/i;
+    if (!regex.test(url)) {
+      url = `https://${url}`;
+    }
+    link.setAttribute("href", url);
+    return link;
+  },
   buildSelect() {
     const select = this.dom("<select>").addClass("rx-form-select");
     const items = this.opts.get("linkstyles.items");

data/app/views/formstrap/_link.html.erb

@@ -0,0 +1,3 @@
+<%= link_to url, options do %>
+  <%= yield %>
+<% end %>

data/lib/formstrap/form_builder.rb

@@ -11,15 +11,15 @@ module Formstrap
       render_input(:association, attribute, options)
     end
 
-    def preview_button(value = nil, options = {}, &block)
+    def preview_button(url = nil, options = {}, &block)
       default_options = {
         data: {
           controller: "preview",
-          "preview-url-value": options[:url]
-        },
-        type: nil
+          preview_url_value: url
+        }
       }
-      button value, default_options.deep_merge(options.except(:url)), &block
+
+      @template.render("formstrap/link", form: self, url: url, options: default_options.deep_merge(options), &block)
     end
 
     def checkbox(attribute, formstrap: true, **options)

data/lib/formstrap/version.rb

@@ -1,3 +1,3 @@
 module Formstrap
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formstrap
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Jef Vlamings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies: []
 description: An extensive Bootstrap form library to power your Ruby On Rails application.
 email:
@@ -142,6 +142,7 @@ files:
 - app/views/formstrap/_hint.html.erb
 - app/views/formstrap/_input_group.html.erb
 - app/views/formstrap/_label.html.erb
+- app/views/formstrap/_link.html.erb
 - app/views/formstrap/_media.html.erb
 - app/views/formstrap/_number.html.erb
 - app/views/formstrap/_password.html.erb