scrivito_advanced_editors 0.90.0.rc1 → 0.90.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38dbbfe68c25c0d405f26124f3079314af575f88
-  data.tar.gz: 0e9c6885568f5b264f1b843c58ce06065225f53f
+  metadata.gz: 4243352121b93e07d83c8af9721d4b94f5e22795
+  data.tar.gz: 537e46abbb489c2e323ab5f1ce6643b142205ad4
 SHA512:
-  metadata.gz: 95607a4fb909790d6e66d1c50b9ff7d193fdc3e5c4a1b98fd9528d49625f2b9a08db90807b59ffba57b5f82d614b22682ec3893bc7b69631348b87df97950e66
-  data.tar.gz: 5ed8a2f4d95f6fa43719c0045f07bb403ff8be0e1ec5c7942eb1877712f28757c373a58b24923fe133aa084ec2ecbdfbb165c42a22808b59741dbd145d5cf6c4
+  metadata.gz: ffaef98fc5ede4a582d89a1b36ffca0a14a873d4e0b819277fa1a0a19f9754709c6182d88f88b9bde1c0a5a2338fc168bb87a79c01766003b09b759096226165
+  data.tar.gz: 338380b99235f45c3eb4600a074f09653d53fd953d140fc013f29f9f4ad84ffe0fa1b3b01105ee8526016cccf6599ef58bfed010d19f4c3ac17fbfa36a3fdbb7

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

@@ -1,48 +1,47 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
-    App.ScrivitoColorPicker = {
-      init_function: function(scrivito_tag) {
-        var content = $(scrivito_tag).scrivito('content');
-        var values = $(scrivito_tag).data('colors-list');
+  var ScrivitoColorPicker = {
+    init_function: function(scrivito_tag) {
+      var content = $(scrivito_tag).scrivito('content');
+      var values = $(scrivito_tag).data('colors-list');
 
-        $(scrivito_tag).addClass('button_list').html('');
-        return $.each(values, function(index, color) {
-          var css_class = (color === content) ? 'active' : 'inactive'
-          $('<button></button>')
-            .addClass('scrivito-toggle-button')
-            .addClass('color-select')
-            .addClass(color === "" ? "default" : color)
-            .addClass(color !== "" ? '' : 'transparent_bg')
-            .addClass(css_class)
-            .data('content', color)
-            .html('')
-            .appendTo($(scrivito_tag));
-        });
-      },
+      $(scrivito_tag).addClass('toggle_button_list').html('');
+      return $.each(values, function(index, color) {
+        var css_class = (color === content) ? 'active' : 'inactive'
+        $('<button></button>')
+          .addClass('scrivito-toggle-button')
+          .addClass('color-select')
+          .addClass(color === "" ? "default" : color)
+          .addClass(color !== "" ? '' : 'transparent_bg')
+          .addClass(css_class)
+          .data('content', color)
+          .html('')
+          .appendTo($(scrivito_tag));
+      });
+    },
 
-      clickFunction: function(event) {
-        var text = $(event.currentTarget).data('content');
-        var scrivito_tag = $(event.currentTarget).parent();
+    clickFunction: function(event) {
+      var text = $(event.currentTarget).data('content');
+      var scrivito_tag = $(event.currentTarget).parent();
 
-        scrivito_tag.find('.active').removeClass('active');
-        $(event.currentTarget).addClass('active');
+      scrivito_tag.find('.active').removeClass('active');
+      $(event.currentTarget).addClass('active');
 
-        scrivito_tag.scrivito('save', text);
-      },
-    };
+      scrivito_tag.scrivito('save', text);
+    },
+  };
 
-    scrivito.on('load', function() {
-      scrivito.define_editor("color_picker", {
-        can_edit: function(element) {
-          return $(element).is('[data-colors-list]');
-        },
-        activate: function(element) {
-          ScrivitoColorPicker.init_function(element);
-          $(element).on('click', '.scrivito-toggle-button', ScrivitoColorPicker.clickFunction);
-        }
-      });
+  scrivito.on('load', function() {
+    scrivito.define_editor("color_picker", {
+      can_edit: function(element) {
+        return $(element).is('[data-colors-list]');
+      },
+      activate: function(element) {
+        ScrivitoColorPicker.init_function(element);
+        $(element).on('click', '.scrivito-toggle-button', ScrivitoColorPicker.clickFunction);
+      }
     });
   });
+
 })(jQuery, this);

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

@@ -20,7 +20,8 @@ $(function() {
         }
 
         if(with_date != "") {
-          jQuery.extend({with_date: now}, options)
+          var attribute = options['with_date'];
+          jQuery.extend({attribute: now}, options)
         }
 
         return scrivito.create_obj(options).done(function(data) {

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

@@ -1,15 +1,14 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
-    scrivito.on('content', function(content) {
-      $(content).find('[data-scrivito-toggle-details]').on('click', function() {
-        var details_link = $(this);
-        var details_id = details_link.data('scrivito-toggle-details');
-        var details = details_link.parent().find('.scrivito-details-' + details_id);
-        details.toggle();
-        return false;
-      });
+  scrivito.on('content', function(content) {
+    $(content).find('[data-scrivito-toggle-details]').on('click', function() {
+      var details_link = $(this);
+      var details_id = details_link.data('scrivito-toggle-details');
+      var details = details_link.parent().find('.scrivito-details-' + details_id);
+      details.toggle();
+      return false;
     });
   });
+
 })(jQuery, this);

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

@@ -1,63 +1,62 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
-    App.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));
-        });
-      },
-
-      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, content) >= 0) {
-          array_content.splice( content.indexOf(newValue), 1 );
-        } else {
-          array_content.push(newValue);
-        }
-
-        $(event.currentTarget).toggleClass('active');
-
-        var to_save = $(scrivito_tag).is('[data-scrivito-field-type=multienum]') ? array_content : array_content.join('%|%');
-
-        scrivito_tag.scrivito('save', to_save);
-      },
-    };
-
-    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);
-        }
+  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));
       });
+    },
+
+    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, content) >= 0) {
+        array_content.splice( content.indexOf(newValue), 1 );
+      } else {
+        array_content.push(newValue);
+      }
+
+      $(event.currentTarget).toggleClass('active');
+
+      var to_save = $(scrivito_tag).is('[data-scrivito-field-type=multienum]') ? array_content : array_content.join('%|%');
+
+      scrivito_tag.scrivito('save', to_save);
+    },
+  };
+
+  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);
+      }
     });
   });
+
 })(jQuery, this);

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

@@ -1,22 +1,20 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
-    scrivito.on('content', function() {
-      var tab_list = $('.tab-list');
-      var active = tab_list.find('.active');
+  scrivito.on('content', function(content) {
+    var tab_list = $(content).find('.tab-list');
+    var active = tab_list.find('.active');
 
-      $(active.data('panel-target')).addClass('active');
+    $(active.data('panel-target')).addClass('active');
 
-      tab_list.on('click', 'li', function() {
-        var target = $(this).data('panel-target');
-        if(!$(this).hasClass('inactive')) {
-          $(target).siblings('.active').removeClass('active');
-          $(this).siblings('.active').removeClass('active');
-          $(target).addClass('active');
-          $(this).addClass('active');
-        }
-      });
+    tab_list.on('click', 'li', function() {
+      var target = $(this).data('panel-target');
+      if(!$(this).hasClass('inactive')) {
+        $(target).siblings('.active').removeClass('active');
+        $(this).siblings('.active').removeClass('active');
+        $(target).addClass('active');
+        $(this).addClass('active');
+      }
     });
   });
 

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

@@ -1,35 +1,32 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
+  var TextareaEditor = {
+    // set selector for Editor
+    selector: '[data-editor=scrivito-textarea-editor]',
 
-    App.textareaEditor = {
-      // set selector for Editor
-      selector: '[data-editor=scrivito-textarea-editor]',
-
-      initFunction: function() {
-        var editors = $(textareaEditor.selector);
-        $.each(editors, function(i, editor) {
-          var textarea = $("<textarea></textarea>").val($(editor).html());
-          $(editor).html(textarea);
-        });
-      },
+    initFunction: function() {
+      var editors = $(TextareaEditor.selector);
+      $.each(editors, function(i, editor) {
+        var textarea = $("<textarea></textarea>").val($(editor).html());
+        $(editor).html(textarea);
+      });
+    },
 
-      blurFunction: function(cmsField) {
-        var text = cmsField.val();
-        return cmsField.parent().scrivito('save', text);
-      }
-    };
+    blurFunction: function(cmsField) {
+      var text = cmsField.val();
+      return cmsField.parent().scrivito('save', text);
+    }
+  };
 
-    scrivito.on('load', function() {
+  scrivito.on('load', function() {
+    if(scrivito.in_editable_view()) {
+      TextareaEditor.initFunction();
+    }
+    return $('body').on('blur', TextareaEditor.selector + " textarea", function(event) {
       if(scrivito.in_editable_view()) {
-        textareaEditor.initFunction();
+        TextareaEditor.blurFunction($(event.target));
       }
-      return $('body').on('blur', textareaEditor.selector + " textarea", function(event) {
-        if(scrivito.in_editable_view()) {
-          textareaEditor.blurFunction($(event.target));
-        }
-      });
     });
   });
 

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

@@ -1,49 +1,48 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
-    App.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');
+  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('button_list').html('');
-        return $.each(values, function(index, value) {
-          var css_class = (value === 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));
-        });
-      },
+      $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();
+    clickFunction: function(event) {
+      var text = $(event.currentTarget).data('content');
+      var scrivito_tag = $(event.currentTarget).parent();
 
-        scrivito_tag.find('.active').removeClass('active');
-        $(event.currentTarget).addClass('active');
+      scrivito_tag.find('.active').removeClass('active');
+      $(event.currentTarget).addClass('active');
 
-        scrivito_tag.scrivito('save', text);
-      },
-    };
+      scrivito_tag.scrivito('save', text);
+    },
+  };
 
-    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);
-        }
-      });
+  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);
+      }
     });
   });
+
 })(jQuery, this);

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

@@ -0,0 +1,11 @@
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select {
+  padding: 3px;
+  font-size: 0px;
+  line-height: 10px;
+  width: 45px;
+  height: 45px;
+}
+
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select.none {
+  font-size: 10px;
+}

data/app/assets/stylesheets/scrivito_advanced_editors/{scrivito_dialog.css.scss → scrivito_dialog.css}

@@ -32,11 +32,12 @@
   margin: 5px -10px -10px;
 }
 
-.scrivito_content_group {
-  h1,h2,h3,h4,h5,h6 {
-    small {
-      color: #bbb;
-      margin-left: 20px;
-    }
-  }
-}
+.scrivito_content_group h1 small,
+.scrivito_content_group h2 small,
+.scrivito_content_group h3 small,
+.scrivito_content_group h4 small,
+.scrivito_content_group h5 small,
+.scrivito_content_group h6 small {
+  color: #bbb;
+  margin-left: 20px;
+}

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

@@ -1,15 +1,15 @@
-.scrivito_dialog .button_list {
+.scrivito_dialog .toggle_button_list {
   overflow: hidden;
   position: relative;
 }
 
-.scrivito_dialog [data-scrivito-field-type="enum"].button_list {
+.scrivito_dialog [data-scrivito-field-type="enum"].toggle_button_list {
   background: transparent;
   border: none;
   padding: 0;
 }
 
-.scrivito_dialog .button_list .scrivito-toggle-button {
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button {
   margin: 4px;
   min-width: 28px;
   background: #ddd;
@@ -26,17 +26,17 @@
   padding: 5px 15px;
 }
 
-.scrivito_dialog .button_list .scrivito-toggle-button:hover {
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button:hover {
   background: #ccc;
 }
 
-.scrivito_dialog .button_list .scrivito-toggle-button.active {
+.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 .button_list .scrivito-toggle-button.color-select {
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select {
   background: transparent;
   transition: width 0.3s, height 0.3s, margin 0.3s;
   position: relative;
@@ -44,7 +44,7 @@
   margin: 7px 4px;
 }
 
-.scrivito_dialog .button_list .scrivito-toggle-button.color-select.active {
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select.active {
   background: transparent;
   height: 51px;
   width: 51px;

data/app/assets/stylesheets/scrivito_advanced_editors/{transparent_bg.css.scss → transparent_bg.css}

@@ -1,4 +1,4 @@
-.scrivito_dialog .button_list .scrivito-toggle-button.color-select:before {
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select:before {
   content: '';
   background-color: #fff;
   background-image:
@@ -14,7 +14,7 @@
   bottom: 0;
 }
 
-.scrivito_dialog .button_list .scrivito-toggle-button.color-select:after {
+.scrivito_dialog .toggle_button_list .scrivito-toggle-button.color-select:after {
   content: '';
   background-color: inherit;
   position: absolute;

data/app/helpers/scrivito_advanced_editors/scrivito_advanced_tag_helper.rb

@@ -11,7 +11,7 @@ module ScrivitoAdvancedEditors
 
     def scrivito_toggle_button_editor(obj, attribute, list=nil)
       if list
-        scrivito_tag(:div, obj, attribute, data: {toggle_list: list})
+        scrivito_tag(:div, obj, attribute, data: {toggle_button_list: list})
       else
         scrivito_tag(:div, obj, attribute)
       end

data/lib/scrivito_advanced_editors/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_advanced_editors
 version: !ruby/object:Gem::Version
-  version: 0.90.0.rc1
+  version: 0.90.0.rc2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,14 +84,14 @@ files:
 - app/assets/javascripts/scripts/scrivito_toggle_button.js
 - app/assets/javascripts/scrivito_advanced_editors.js
 - app/assets/stylesheets/scrivito_advanced_editors.css
-- app/assets/stylesheets/scrivito_advanced_editors/color_picker.css.scss
+- 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.scss
+- 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.scss
-- app/assets/stylesheets/scrivito_advanced_editors/transparent_bg.css.scss
+- 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

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

@@ -1,10 +0,0 @@
-.scrivito_dialog .button_list .scrivito-toggle-button.color-select {
-  padding: 3px;
-  font-size: 0px;
-  line-height: 10px;
-  width: 45px;
-  height: 45px;
-  &.none {
-    font-size: 10px;
-  }
-}