sibu 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de8d62d4237579055ee7beb1d2444f26a3ef5029
-  data.tar.gz: 738a04d070723936adb20d39df2c10cd3fbc0f75
+  metadata.gz: db5c9e53e7af3a3a4a93b78aedd5fba7a6a88a1c
+  data.tar.gz: cb0cfcbd86d03a876ea3ff875a530a19ea49dac1
 SHA512:
-  metadata.gz: 8cabf4bcc31acdf588aabea0ce004a82343abeecd1c1741f0c6cc6ba0bd881087774a252834977f8d6819b8ec5704d566e5335b4b408474b5180a0ab6d7b7190
-  data.tar.gz: bba89e84090cd9505ff62e2cec96061bf68c8c6fd128b2eed06c999eaaa0997a5b05e7093b099e77135a565aea37de21a596985a220275ba69f5c4db17f3e3f1
+  metadata.gz: b4b53790db656a48e262d9371428618488c0687426ee3e520b6eebe613c0056be8585e9772ab6c57696b6dc5c91af613c7fb036183c222e041e22eeae399a220
+  data.tar.gz: 342daebed0d022723f72679935da515e87dd2d83442a2e4014b295ab3fbf0f2f576ab1251044cb1e1f4bafad13246148940ba35fdf20fa4ab4aefbeeb1ede912

data/app/assets/javascripts/sibu/sibu.js.erb

@@ -31,6 +31,22 @@ IconBlot.tagName = 'a';
 Quill.register(IconBlot);
 Quill.register(Quill.import('attributors/style/align'), true);
 
+var Link = Quill.import('formats/link');
+
+class CustomLink extends Link {
+    static create(value) {
+        let node = super.create(value);
+        value = this.sanitize(value);
+        node.setAttribute('href', value);
+        if(value.startsWith("/")) {
+            node.removeAttribute('target');
+        }
+        return node;
+    }
+}
+
+Quill.register(CustomLink);
+
 function initQuillEditor(container) {
     var quillModules;
     var modulesCallback = "sibuEditorModules";

data/app/controllers/sibu/documents_controller.rb

@@ -21,7 +21,7 @@ module Sibu
     end
 
     def destroy
-      @document = @document.find(params[:id])
+      @document = Sibu::Document.find(params[:id])
       @document.destroy
       redirect_to documents_url, notice: "Le document a bien été supprimé."
     end

data/app/helpers/sibu/pages_helper.rb

@@ -28,8 +28,10 @@ module Sibu
         'internal'
       elsif Sibu::Document.for_user(sibu_user).map {|d| d.file_url}.include?(val)
         'document'
-      else
+      elsif val.to_s.include?('/')
         'external'
+      else
+        'email'
       end
     end
 
@@ -155,8 +157,10 @@ module Sibu
       val = content.delete("value") || ""
       text = content.delete("text")
       html_opts.merge!({data: {id: elt_id(elt), type: "link", repeat: repeat, children: children}}) if action_name != 'show'
-      if val.to_s.include?('/')
+      if val.to_s.include?('/') || val.to_s.include?('#')
         content["href"] = val
+      elsif val.to_s.include?('@')
+        content["href"] = 'mailto:'+val
       else
         content["href"] = @links.keys.include?(val.to_s) ? (action_name == 'show' ? link_path(val) : site_page_edit_content_path(@site.id, val)) : '#'
       end

data/app/views/sibu/pages/_link_edit_panel.html.erb

@@ -8,19 +8,25 @@
       <%= label_tag 'element[text]', 'Libellé' %>
       <%= text_field_tag 'element[text]', @element["text"] %>
     </div>
-    <div id="link_internal" class="sibu_field">
+    <div id="link_internal" class="sibu_field link_mode">
       <%= radio_button_tag :mode, 'internal', current_type == 'internal', class: 'radio' %>
       <%= label_tag 'mode_internal', 'Lien vers une page du site' %>
       <%= select_tag 'element[value]', available_links, prompt: 'Sélectionnez une page', disabled: current_type != 'internal' %>
       <%= hidden_field_tag 'element[target]', '_self', disabled: current_type != 'internal' %>
     </div>
-    <div id="link_external" class="sibu_field">
+    <div id="link_external" class="sibu_field link_mode">
       <%= radio_button_tag :mode, 'external', current_type == 'external', class: 'radio' %>
       <%= label_tag 'mode_external', 'Lien vers un autre site' %>
       <%= text_field_tag 'element[value]', (@element["value"] if current_type == 'external'), placeholder: 'Ex : http://www.un-site.com', disabled: current_type != 'external' %>
       <%= hidden_field_tag 'element[target]', '_blank', disabled: current_type != 'external' %>
     </div>
-    <div id="link_document" class="sibu_field">
+    <div id="link_email" class="sibu_field link_mode">
+      <%= radio_button_tag :mode, 'email', current_type == 'email', class: 'radio' %>
+      <%= label_tag 'mode_external', 'Lien vers un Email' %>
+      <%= text_field_tag 'element[value]', (@element["value"] if current_type == 'email'), placeholder: 'Ex : email@exemple.fr', disabled: current_type != 'email' %>
+      <%= hidden_field_tag 'element[target]', '_blank', disabled: current_type != 'email' %>
+    </div>
+    <div id="link_document" class="sibu_field link_mode">
       <%= radio_button_tag :mode, 'document', current_type == 'document', class: 'radio' %>
       <%= label_tag 'mode_document', 'Lien vers un document' %>
       <%= select_tag 'element[value]', available_docs, prompt: 'Sélectionnez un document', disabled: current_type != 'document' %>

data/app/views/sibu/pages/edit_element.js.erb

@@ -74,9 +74,12 @@ editPanel.slideDown("fast", function() {
     <% when 'link' %>
         $("input[name='mode']").change(function() {
             var selected = $(this).val();
-            var other = selected === 'internal' ? 'external' : 'internal';
             $("#link_" + selected).find("#element_value, #element_target").removeAttr("disabled");
-            $("#link_" + other).find("#element_value, #element_target").attr("disabled", "disabled");
+            $(".sibu_edit_form").find(".link_mode").each(function() {
+              if($(this).attr("id") !== ("link_" + selected)) {
+                $(this).find("#element_value, #element_target").attr("disabled", "disabled");
+              }
+            });
         });
     <% else %>
     <% end %>

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Jean-Baptiste Vilain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails