scrivito_advanced_editors 0.90.0 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b2bbdbfd168aa525e1bba4ecff5d77d032fc77
-  data.tar.gz: b8fed4871888217730b24eacbd4446476a1bdabd
+  metadata.gz: 8d67ccd96d0f92203bc801001fbe9abda97740fd
+  data.tar.gz: 819ac1a7bcc835d3fb81f3668ce64c7cdc7d32e7
 SHA512:
-  metadata.gz: 35bd327d93ff54040872e65207602304f00054560e7e7db8df34a2345885b0109fff7338adeac34f4e2e421a9be02620cc771dbfce7ca0f46b59dbee3bccec6d
-  data.tar.gz: d20b84ae10243b65f7f5a532da64f765f24c39bc3caaaa77ed37f1e19b5d58b86e11c1a5377dcb1195525563c0b2a68f9bdb3fe752c288871a0c6c7d89ae7eb6
+  metadata.gz: e930f550a7d91f161a60e0766a80b6310736698568f00ab6f8e0dc5348dc75c86670edf5c9448e9ee73090dadd01fa197ec99a4da0c6adfa4ee5322c256c2905
+  data.tar.gz: 2dc9bffc5a11adfdf58aa1b2ee8696289c649a90cb1394d01df740022ef7421632a2fd706e74a80d447c7c76a65b0a23c2af8fe3d79e4ff32308d207a22edf18

data/app/assets/javascripts/scripts/color_picker.js

@@ -6,12 +6,14 @@
       var content = $(scrivito_tag).scrivito('content');
       var values = $(scrivito_tag).data('colors-list');
 
-      $(scrivito_tag).addClass('toggle_button_list').html('');
+      var with_text = $(scrivito_tag).data('scrivito-color-picker-show-text') == true;
+      if(with_text) $(scrivito_tag).addClass('with-text');
+
+      $(scrivito_tag).addClass('scrivito_color_picker').html('');
       return $.each(values, function(index, color) {
         var css_class = (color === content) ? 'active' : 'inactive'
         $('<button></button>')
-          .addClass('scrivito-toggle-button')
-          .addClass('color-select')
+          .addClass('scrivito-color-select')
           .addClass(color === "" ? "default" : color)
           .addClass(color !== "" ? '' : 'transparent_bg')
           .addClass(css_class)
@@ -39,7 +41,7 @@
       },
       activate: function(element) {
         ScrivitoColorPicker.init_function(element);
-        $(element).on('click', '.scrivito-toggle-button', ScrivitoColorPicker.clickFunction);
+        $(element).on('click', '.scrivito-color-select', ScrivitoColorPicker.clickFunction);
       }
     });
   });

data/app/assets/javascripts/scripts/multi_select_button.js

@@ -1,62 +1,61 @@
 (function($, App) {
   'use strict';
 
-  var ScrivitoMultiSelectButton = {
-    init_function: function(scrivito_tag) {
-      var content = $(scrivito_tag).scrivito('content');
-      var is_enum = $(scrivito_tag).is('[data-scrivito-field-type=multienum]');
-      var values = is_enum ? $(scrivito_tag).scrivito('allowed_values') : $(scrivito_tag).data('multi-select-list');
-      var captions = $(scrivito_tag).data('multi-select-caption');
-
-      $(scrivito_tag).addClass('button_list').addClass('select').html('');
-      return $.each(values, function(index, value) {
-        var css_class = ($.inArray(value, content) >= 0) ? 'active' : 'inactive'
-
-        if(!is_enum) css_class = (content.indexOf(value) > -1) ? 'active' : 'inactive'
-
-        var caption = (captions && captions[value]) ? captions[value] : value
-        $('<button></button>')
-          .addClass('scrivito-multi-select-button')
-          .addClass(css_class)
-          .data('content', value)
-          .html(caption)
-          .appendTo($(scrivito_tag));
-      });
+  var activate, handleClick, renderTemplate,
+  indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+
+  scrivito.editors.multienum_editor = {
+    can_edit: function(element) {
+      var is_multienum = $(element).is('[data-scrivito-field-type=multienum]')
+      var has_list = $(element).is('[data-multi-select-list]');
+      return is_multienum || has_list;
     },
+    activate: function(element) {
+      return activate($(element));
+    }
+  };
 
-    clickFunction: function(event) {
-      var newValue = $(event.currentTarget).data('content');
-      var scrivito_tag = $(event.currentTarget).parent();
-      var content = $(scrivito_tag).scrivito('content');
-      var array_content = Array.isArray(content) ? content : content.split('%|%')
-      if(content === "") array_content = []
-
-      if($.inArray(newValue, array_content) >= 0) {
-        array_content.splice( array_content.indexOf(newValue), 1 );
-      } else {
-        array_content.push(newValue);
-      }
-
-      var to_save = $(scrivito_tag).is('[data-scrivito-field-type=multienum]') ? array_content : array_content.join('%|%');
+  scrivito.on('load', function() {
+    return scrivito.define_editor('multienum', scrivito.editors.enum_editor);
+  });
 
-      scrivito_tag.scrivito('save', to_save).then(function() {
-        $(event.currentTarget).toggleClass('active');
-      });
-    },
+  activate = function(cmsField) {
+    var validValues = cmsField.data('multi-select-list') || cmsField.scrivito('valid_values');
+    var captions = cmsField.data('multi-select-caption');
+    cmsField.html(renderTemplate(cmsField.scrivito('content'), validValues, captions));
+    return cmsField.find('.scrivito_enum_editor li').on('click', function() {
+      return handleClick(cmsField, $(this));
+    });
   };
 
-  scrivito.on('load', function() {
-    scrivito.define_editor("toggle_multi_select_editor", {
-      can_edit: function(element) {
-        var is_enum = $(element).is('[data-scrivito-field-type=multienum]')
-        var has_list = $(element).is('[data-multi-select-list]')
-        return is_enum || has_list;
-      },
-      activate: function(element) {
-        ScrivitoMultiSelectButton.init_function(element);
-        $(element).on('click', '.scrivito-multi-select-button', ScrivitoMultiSelectButton.clickFunction);
+  renderTemplate = function(values, validValues, captions) {
+    var i, len, li, ul, validValue, caption;
+    ul = $('<ul class="scrivito_enum_editor scrivito_multi"></ul>');
+    for (i = 0, len = validValues.length; i < len; i++) {
+      validValue = validValues[i];
+      caption = (captions && captions[validValue]) ? captions[validValue] : validValue;
+      li = $('<li></li>');
+      li.text(caption);
+      li.data('scrivito-select-value', validValue);
+      if (indexOf.call(values, validValue) >= 0) {
+        li.addClass('scrivito_enum_active');
       }
+      ul.append(li);
+    }
+    return ul;
+  };
+
+  handleClick = function(cmsField, clickedItem) {
+    var values;
+    clickedItem.toggleClass('scrivito_enum_active');
+    values = $.map(cmsField.find('li.scrivito_enum_active'), function(item) {
+      return $(item).data('scrivito-select-value');
     });
-  });
+    cmsField.scrivito('save', values).done(function() {
+      cmsField.trigger('scrivito_editors:save');
+      return cmsField.trigger('scrivito_editors:blur');
+    });
+    return false;
+  };
 
-})(jQuery, this);
+})(jQuery, this);

data/app/assets/javascripts/scripts/scrivito_toggle_button.js

@@ -1,48 +1,66 @@
 (function($, App) {
   'use strict';
 
-  var ScrivitoToggleButton = {
-    init_function: function($scrivito_tag) {
-      var content = $scrivito_tag.scrivito('content');
-      var values = $scrivito_tag.is('[data-scrivito-field-type=enum]') ? $scrivito_tag.scrivito('allowed_values') : $scrivito_tag.data('toggle-button-list');
-      var captions = $scrivito_tag.data('toggle-button-caption');
-
-      $scrivito_tag.addClass('toggle_button_list').html('');
-      return $.each(values, function(index, value) {
-        var css_class = (value.toString() === content) ? 'active' : 'inactive'
-        var caption = (captions && captions[value]) ? captions[value] : value
-        $('<button></button>')
-          .addClass('scrivito-toggle-button')
-          .addClass(css_class)
-          .data('content', value)
-          .html(caption)
-          .appendTo($scrivito_tag);
-      });
-    },
-
-    clickFunction: function(event) {
-      var text = $(event.currentTarget).data('content');
-      var scrivito_tag = $(event.currentTarget).parent();
+  var activate, handleClick, renderTemplate, save;
 
-      scrivito_tag.scrivito('save', text).then(function() {
-        scrivito_tag.find('.active').removeClass('active');
-        $(event.currentTarget).addClass('active');
-      });
+  scrivito.editors.enum_editor = {
+    can_edit: function(element) {
+      var is_enum = $(element).is('[data-scrivito-field-type=enum]');
+      var has_list = $(element).is('[data-toggle-button-list]');
+      return is_enum || has_list;
     },
+    activate: function(element) {
+      return activate($(element));
+    }
   };
 
   scrivito.on('load', function() {
-    scrivito.define_editor("toggle_button_editor", {
-      can_edit: function(element) {
-        var is_enum = $(element).is('[data-scrivito-field-type=enum]')
-        var has_list = $(element).is('[data-toggle-button-list]')
-        return is_enum || has_list;
-      },
-      activate: function(element) {
-        ScrivitoToggleButton.init_function($(element));
-        $(element).on('click', '.scrivito-toggle-button', ScrivitoToggleButton.clickFunction);
-      }
-    });
+    return scrivito.define_editor('enum', scrivito.editors.enum_editor);
   });
 
+  activate = function(cmsField) {
+    var validValues = cmsField.data('toggle-button-list') || cmsField.scrivito('valid_values');
+    var captions = cmsField.data('toggle-button-caption');
+    cmsField.html(renderTemplate(cmsField.scrivito('content'), validValues, captions));
+    return cmsField.find('.scrivito_enum_editor li').on('click', function() {
+      return handleClick(cmsField, $(this));
+    });
+  };
+
+  renderTemplate = function(value, validValues, captions) {
+    var i, len, li, ul, validValue, caption;
+
+    ul = $('<ul class="scrivito_enum_editor"></ul>');
+    for (i = 0, len = validValues.length; i < len; i++) {
+      validValue = validValues[i];
+      caption = (captions && captions[validValue]) ? captions[validValue] : validValue;
+      li = $('<li></li>');
+      li.text(caption);
+      li.data('scrivito-toggle-value', validValue);
+      if (validValue === value) {
+        li.addClass('scrivito_enum_active');
+      }
+      ul.append(li);
+    }
+    return ul;
+  };
+
+  handleClick = function(cmsField, clickedItem) {
+    if (clickedItem.hasClass('scrivito_enum_active')) {
+      clickedItem.removeClass('scrivito_enum_active');
+      save(cmsField, null);
+    } else {
+      cmsField.find('li').removeClass('scrivito_enum_active');
+      clickedItem.addClass('scrivito_enum_active');
+      save(cmsField, clickedItem.data('scrivito-toggle-value'));
+    }
+    return false;
+  };
+
+  save = function(cmsField, value) {
+    return cmsField.scrivito('save', value).done(function() {
+      cmsField.trigger('scrivito_editors:save');
+      return cmsField.trigger('scrivito_editors:blur');
+    });
+  };
 })(jQuery, this);

data/app/assets/stylesheets/scrivito_advanced_editors/color_picker.css

@@ -1,11 +1,78 @@
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select {
+.scrivito_dialog [data-colors-list] {
+  background: #fff;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+  color: #555;
+  display: block;
+  font-size: 14px;
+  min-height: 71px;
+  margin: 0;
+  padding: 6px 12px;
+  width: 100%;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-weight: normal;
+}
+.scrivito_dialog [data-colors-list] .scrivito-color-select {
   padding: 3px;
   font-size: 0px;
   line-height: 10px;
   width: 45px;
   height: 45px;
+  overflow: hidden;
+  position: relative;
+  border: 0;
+  margin: 0 5px 0 0;
+  box-shadow: 0 0 4px 1px rgba(0,0,0,0.1);
+  border-radius: 3px;
+  background: transparent;
+  top: -5px;
+  outline: none;
+}
+
+.scrivito_dialog [data-colors-list] .scrivito-color-select.active {
+  width: 55px;
+  height: 55px;
+  top: 0;
 }
 
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select.none {
+.scrivito_dialog [data-colors-list] .scrivito-color-select.none {
   font-size: 10px;
+}
+
+.scrivito_dialog [data-colors-list].with-text .scrivito-color-select:after {
+  content: 'Lorem Ipsum dolor';
+  font-size: 11px;
+  line-height: 13px;
+  padding-top: 3px;
+}
+
+.scrivito_dialog [data-colors-list].with-text .scrivito-color-select.active:after {
+  padding-top: 8px;
+}
+
+.scrivito_dialog [data-colors-list] .scrivito-color-select:before {
+  content: '';
+  background-color: #fff;
+  background-image:
+    linear-gradient(45deg, #33312d 25%, transparent 25%, transparent 75%, #33312d 75%, #33312d),
+    linear-gradient(45deg, #33312d 25%, transparent 25%, transparent 75%, #33312d 75%, #33312d);
+
+  background-size: 20px 20px;
+  background-position:0 0, 30px 30px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.scrivito_dialog [data-colors-list] .scrivito-color-select:after {
+  content: '';
+  background: inherit;
+  background-size: cover;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
 }

data/app/assets/stylesheets/scrivito_advanced_editors/scrivito_toggle_button.css

@@ -1,52 +1,15 @@
-.scrivito_dialog .toggle_button_list {
-  overflow: hidden;
-  position: relative;
-}
-
-.scrivito_dialog [data-scrivito-field-type="enum"].toggle_button_list {
-  background: transparent;
-  border: none;
-  padding: 0;
-}
-
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button {
-  margin: 4px;
-  min-width: 28px;
-  background: #ddd;
-  color: #888;
-  outline: none !important;
-  border: none;
+.scrivito_dialog [data-toggle-button-list],
+.scrivito_dialog [data-multi-select-list] {
+  background: #fff;
+  border: 1px solid #ddd;
   border-radius: 5px;
-  cursor: pointer;
-  box-shadow: 0 0 5px rgba(0,0,0,0.1);
-  font-size: 15px;
-  line-height: 15px;
-  width: initial;
-  float: left;
-  padding: 5px 15px;
-}
-
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button:hover {
-  background: #ccc;
-}
-
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.active {
-  box-shadow: 0 0px 5px rgba(0,0,0,0.2);
-  color: white;
-  background: #658b51;
-}
-
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select {
-  background: transparent;
-  transition: width 0.3s, height 0.3s, margin 0.3s;
-  position: relative;
-  overflow: hidden;
-  margin: 7px 4px;
-}
-
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select.active {
-  background: transparent;
-  height: 51px;
-  width: 51px;
-  margin: 4px;
+  color: #555;
+  display: block;
+  font-size: 14px;
+  min-height: 31px;
+  margin: 0;
+  padding: 6px 12px;
+  width: 100%;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-weight: normal;
 }

data/lib/scrivito_advanced_editors/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoAdvancedEditors
-  VERSION = "0.90.0"
+  VERSION = "1.0.0.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_advanced_editors
 version: !ruby/object:Gem::Version
-  version: 0.90.0
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,11 +87,9 @@ files:
 - app/assets/stylesheets/scrivito_advanced_editors/color_picker.css
 - app/assets/stylesheets/scrivito_advanced_editors/create_obj.css
 - app/assets/stylesheets/scrivito_advanced_editors/scrivito_dialog.css
-- app/assets/stylesheets/scrivito_advanced_editors/scrivito_mutli_select_button.css.scss
 - app/assets/stylesheets/scrivito_advanced_editors/scrivito_tabs.css
 - app/assets/stylesheets/scrivito_advanced_editors/scrivito_toggle_button.css
 - app/assets/stylesheets/scrivito_advanced_editors/textarea_editor.css
-- app/assets/stylesheets/scrivito_advanced_editors/transparent_bg.css
 - app/helpers/scrivito_advanced_editors/scrivito_advanced_tag_helper.rb
 - app/views/scrivito_advanced_editors/_create_obj.html.erb
 - lib/scrivito_advanced_editors.rb
@@ -113,9 +111,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

data/app/assets/stylesheets/scrivito_advanced_editors/scrivito_mutli_select_button.css.scss

@@ -1,34 +0,0 @@
-.button_list.select {
-  overflow: hidden;
-  padding: 5px;
-  background-color: white;
-  border-radius: 5px;
-  box-shadow: 0 0 5px #888 inset;
-}
-
-.scrivito_dialog .button_list button.scrivito-multi-select-button {
-  margin: 1px;
-  min-width: 28px;
-  background: #ddd;
-  color: #888;
-  outline: none !important;
-  border: none;
-  cursor: pointer;
-  box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
-  font-size: 15px;
-  border-radius: 5px;
-  line-height: 15px;
-  width: initial;
-  float: left;
-  padding: 5px 15px;
-}
-
-.scrivito_dialog .button_list button.scrivito-multi-select-button:hover {
-  background: #ccc;
-}
-
-.scrivito_dialog .button_list button.scrivito-multi-select-button.active {
-  box-shadow: 0 0px 5px rgba(0,0,0,0.2);
-  color: white;
-  background: #658b51;
-}

data/app/assets/stylesheets/scrivito_advanced_editors/transparent_bg.css

@@ -1,25 +0,0 @@
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select:before {
-  content: '';
-  background-color: #fff;
-  background-image:
-    linear-gradient(45deg, #33312d 25%, transparent 25%, transparent 75%, #33312d 75%, #33312d),
-    linear-gradient(45deg, #33312d 25%, transparent 25%, transparent 75%, #33312d 75%, #33312d);
-
-  background-size: 20px 20px;
-  background-position:0 0, 30px 30px;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}
-
-.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select:after {
-  content: '';
-  background-color: inherit;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-}