scrivito_table_widget 0.5.7.rc2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d48f33865f6e775d054e1b01339da4e479606a5
-  data.tar.gz: e448e36e1c8ffedd1a9fdaac9484a25dd649b47d
+  metadata.gz: ad1b6d8a8f9b3da895b9b3fba02b394e580aa5d0
+  data.tar.gz: 852d9095b40fdb8312ba7bb48d7f7ee69c8aeec1
 SHA512:
-  metadata.gz: e08a3aaaf381cce6b3668fba7a293671ca4bd9c42f6e5721e8b0d8647d7852953bc1bff6cdd08eebd7d90daecf76e0e2a67e17a117a48f2c69ef347ee4ff06d3
-  data.tar.gz: f4b56c8178cdab45da4c4792e1f323dddfb0a9e62c8aeed768ea860202955e036ab1deca4fb5c35509da3ea9d4c4be3edcd76f208a250fc53a61181a9fda1506
+  metadata.gz: 73e719e5a1c8fc49e7ee29b553b2eab09163a2c06dc65f56b862455d8b6faedcc93f7bd35b72652a4160292c7b67e5bdb4af44ae6e5994ac1da7cdedd47964ee
+  data.tar.gz: 7a287d771ebee0272453b886a5b133dd22347db12b4d381e636a16ff1a773a137ab99cacc54e90d86680e2dd446e3e791e77a6a282200030b4a35ebaffe7279e

data/README.md

@@ -15,3 +15,11 @@ Add this line to your editing JavaScript manifest:
 Add this line to your application stylesheet manifest:
 
     *= require scrivito_table_widget
+
+You have to activate the table editor in your select editor JavaScript:
+
+```js
+scrivito.select_editor(function(element, editor) {
+  editor.use("table_editor");
+});
+```

data/app/assets/javascripts/scrivito_table_widget/jquery.edit.table.js

@@ -9,11 +9,19 @@
   var rows = 0;
   var cols = 0;
 
-  $.fn.edittable = function(opts) {
+  $.fn.edittable = function(event) {
+    var elem = $(event.target);
+
+    // remove and save table if other instanze of table-widget is clicked
+    if(!elem.parents('table').is(activeTable)) {
+      $.fn.edittable.clear();
+      initialized = false;
+    }
+
     // initialize
-    if(!initialized && !$(this).hasClass('table-responsive')) {
-      activeTable = this.parents('table');
-      cmsField = this.parents('[data-editor=table-editor]');
+    if(!initialized) {
+      activeTable = elem.parents('table');
+      cmsField = $(event.target).parents('.scrivito-table-editor');
 
       initialized = $.fn.edittable.initialize(cmsField, this);
       rows = $.fn.edittable.getRowCount();
@@ -25,19 +33,14 @@
       $.fn.edittable.bindKeys();
     }
 
-    var elem = this;
-
-    if($(this).get(0).tagName != "TD" && $(this).get(0).tagName != "TH") {
+    if($(elem).get(0).tagName != "TD" && $(elem).get(0).tagName != "TH") {
       elem = elem.parents('td, th');
     }
 
-    // edit
-    if($(elem).get(0) != undefined) {
-      if($(elem).get(0).tagName == "TD" || $(elem).get(0).tagName == "TH") {
-        activeElement = elem;
-        cmsField.attr('contenteditable', true);
-        $.fn.edittable.setButtonPositions();
-      }
+    activeElement = elem;
+    cmsField.attr('contenteditable', true);
+    if(activeElement) {
+      $.fn.edittable.setButtonPositions();
     }
   };
 
@@ -62,8 +65,8 @@
     var width = activeElement.outerWidth();
     var height = activeElement.outerHeight();
 
-    $('.table-buttons.top').css({    top: "-11px",                        left: (base.left - 11), width: width + 23});
-    $('.table-buttons.edit').css({   top: (base.top - 12),                left: (base.left - 5)});
+    $('.table-buttons.top').css({    top: "-12px",                        left: (base.left - 11), width: width + 23});
+    $('.table-buttons.edit').css({   top: (base.top - 12),                left: (base.left + 6)});
     $('.table-buttons.left').css({   top: (base.top - 12),                left: -17, height: height + 24});
     $('.table-buttons.bottom').css({ bottom: "-4px",                      left: (base.left + width/2 - 12)});
     $('.table-buttons.right').css({  top: (base.top + height/2 - 11),      right: -23});
@@ -106,8 +109,10 @@
   }
 
   $.fn.edittable.save = function() {
-    var text = activeTable.get(0).outerHTML;
-    $(cmsField).scrivito('save', text);
+    if(activeTable) {
+      var text = activeTable.get(0).outerHTML;
+      $(cmsField).scrivito('save', text);
+    }
   }
 
   /****
@@ -163,38 +168,38 @@
    ****/
 
   $.fn.edittable.bindButtons = function() {
-    $('.table-widget').find('.add-top').on('click', function() { $.fn.edittable.addTop(); });
-    $('.table-widget').find('.add-bottom').on('click', function() { $.fn.edittable.addBottom(); });
-    $('.table-widget').find('.add-left').on('click', function() { $.fn.edittable.addLeft(); });
-    $('.table-widget').find('.add-right').on('click', function() { $.fn.edittable.addRight(); });
-    $('.table-widget').find('.table-bold').on('click', function() { $.fn.edittable.bold(); });
-    $('.table-widget').find('.table-italic').on('click', function() { $.fn.edittable.italic(); });
-    $('.table-widget').find('.delete-row').on('click', function() { $.fn.edittable.removeRow(); });
-    $('.table-widget').find('.delete-column').on('click', function() { $.fn.edittable.removeColumn(); });
-    $('.table-widget').find('.stripe-table').on('click', function() { $.fn.edittable.tableStriped(); });
-    $('.table-widget').find('.condence-table').on('click', function() { $.fn.edittable.tableCondensed(); });
-    $('.table-widget').find('.hover-table').on('click', function() { $.fn.edittable.tableHover(); });
-    $('.table-widget').find('.border-table').on('click', function() { $.fn.edittable.tableBorder(); });
-    $('.table-widget').find('.first-column').on('click', function() { $.fn.edittable.firstColumn(); });
-    $('.table-widget').find('.table-left').on('click', function() { $.fn.edittable.tableLeft(); });
-    $('.table-widget').find('.table-center').on('click', function() { $.fn.edittable.tableCenter(); });
-    $('.table-widget').find('.table-right').on('click', function() { $.fn.edittable.tableRight(); });
-
-    $('.table-widget').find('.add-success').on('click', function() { $.fn.edittable.addSuccess(); });
-    $('.table-widget').find('.add-info').on('click', function() { $.fn.edittable.addInfo(); });
-    $('.table-widget').find('.add-warning').on('click', function() { $.fn.edittable.addWarning(); });
-    $('.table-widget').find('.add-danger').on('click', function() { $.fn.edittable.addDanger(); });
-
-    $('.table-widget').find('.edit-the-table').on('click', function() { $.fn.edittable.toggleTableOptions('.table-options.main'); });
-    $('.table-widget').find('.edit-the-cell').on('click', function() { $.fn.edittable.toggleTableOptions('.table-buttons.edit'); });
-
-    $('.table-widget').find('.add-left, .add-right').on('mouseover', function() { $.fn.edittable.addHoverVerticalAdd($(this)); });
-    $('.table-widget').find('.add-top, .add-bottom').on('mouseover', function() { $.fn.edittable.addHoverHorizontalAdd($(this)); });
-
-    $('.table-widget').find('.delete-column').on('mouseover', function() { $.fn.edittable.deleteHoverColumn($(this)); });
-    $('.table-widget').find('.delete-row').on('mouseover', function() { $.fn.edittable.deleteHoverRow($(this)); });
-
-    $('.table-widget').find('.add-left, .add-right, .add-top, .add-bottom, .delete-column, .delete-row').on('mouseout', function() { $.fn.edittable.resetHelperLine(); });
+    $(cmsField).parent().find('.add-top').on('click', function() { $.fn.edittable.addTop(); });
+    $(cmsField).parent().find('.add-bottom').on('click', function() { $.fn.edittable.addBottom(); });
+    $(cmsField).parent().find('.add-left').on('click', function() { $.fn.edittable.addLeft(); });
+    $(cmsField).parent().find('.add-right').on('click', function() { $.fn.edittable.addRight(); });
+    $(cmsField).parent().find('.table-bold').on('click', function() { $.fn.edittable.bold(); });
+    $(cmsField).parent().find('.table-italic').on('click', function() { $.fn.edittable.italic(); });
+    $(cmsField).parent().find('.delete-row').on('click', function() { $.fn.edittable.removeRow(); });
+    $(cmsField).parent().find('.delete-column').on('click', function() { $.fn.edittable.removeColumn(); });
+    $(cmsField).parent().find('.stripe-table').on('click', function() { $.fn.edittable.tableStriped(); });
+    $(cmsField).parent().find('.condence-table').on('click', function() { $.fn.edittable.tableCondensed(); });
+    $(cmsField).parent().find('.hover-table').on('click', function() { $.fn.edittable.tableHover(); });
+    $(cmsField).parent().find('.border-table').on('click', function() { $.fn.edittable.tableBorder(); });
+    $(cmsField).parent().find('.first-column').on('click', function() { $.fn.edittable.firstColumn(); });
+    $(cmsField).parent().find('.table-left').on('click', function() { $.fn.edittable.tableLeft(); });
+    $(cmsField).parent().find('.table-center').on('click', function() { $.fn.edittable.tableCenter(); });
+    $(cmsField).parent().find('.table-right').on('click', function() { $.fn.edittable.tableRight(); });
+
+    $(cmsField).parent().find('.add-success').on('click', function() { $.fn.edittable.addSuccess(); });
+    $(cmsField).parent().find('.add-info').on('click', function() { $.fn.edittable.addInfo(); });
+    $(cmsField).parent().find('.add-warning').on('click', function() { $.fn.edittable.addWarning(); });
+    $(cmsField).parent().find('.add-danger').on('click', function() { $.fn.edittable.addDanger(); });
+
+    $(cmsField).parent().find('.edit-the-table').on('click', function() { $.fn.edittable.toggleTableOptions('.table-options.main'); });
+    $(cmsField).parent().find('.edit-the-cell').on('click', function() { $.fn.edittable.toggleTableOptions('.table-buttons.edit'); });
+
+    $(cmsField).parent().find('.add-left, .add-right').on('mouseover', function() { $.fn.edittable.addHoverVerticalAdd($(this)); });
+    $(cmsField).parent().find('.add-top, .add-bottom').on('mouseover', function() { $.fn.edittable.addHoverHorizontalAdd($(this)); });
+
+    $(cmsField).parent().find('.delete-column').on('mouseover', function() { $.fn.edittable.deleteHoverColumn($(this)); });
+    $(cmsField).parent().find('.delete-row').on('mouseover', function() { $.fn.edittable.deleteHoverRow($(this)); });
+
+    $(cmsField).parent().find('.add-left, .add-right, .add-top, .add-bottom, .delete-column, .delete-row').on('mouseout', function() { $.fn.edittable.resetHelperLine(); });
   }
 
   /****

data/app/assets/javascripts/scrivito_table_widget/tableEditor.js

@@ -1,39 +1,28 @@
 (function($, App) {
   'use strict';
 
-  $(function() {
-    App.tableEditor = {
-      // set selector for Editor
-      selector: '[data-editor=table-editor]',
-
-      // set function triggert on click
-      clickFunction: function(cmsField) {
-        cmsField.edittable();
-      },
-
-      blurFunction: function(cmsField) {
-        var response = $.fn.edittable.clear();
-        if(response != undefined) return $(response.cmsField).scrivito('save', response.text);
-      }
-    };
-
-    // Set click event
-    scrivito.on('load', function() {
-      return $('body').on('click', '.table-widget', function(event) {
-        if(scrivito.in_editable_view()) {
-          tableEditor.clickFunction($(event.target));
-        };
+  var table_editor = {
+    can_edit: function(element) {
+      return $(element).is('.scrivito-table-editor');
+    },
+    activate: function(element) {
+      $(element).on('click', function(event) {
+        $(element).edittable(event);
+        scrivito.editors.medium_editor.activate(element);
         event.stopPropagation();
       });
-    });
 
-    scrivito.on('load', function() {
-      return $('body').on('click', function(event) {
-        if(scrivito.in_editable_view()) {
-          tableEditor.blurFunction($(event.target));
-        };
+      $('body').on('click', function(event) {
+        if(!$(event.target).parents('.table-buttons').length && !$(event.target).parents('.table-options').length) {
+          var response = $.fn.edittable.clear();
+          if(response != undefined) return $(response.cmsField).scrivito('save', response.text);
+        }
       });
-    });
+    }
+  };
+
+  scrivito.on('content', function() {
+    return scrivito.define_editor('toggle_button_editor', table_editor);
   });
 
-})(jQuery, this);
+})(jQuery, this);

data/app/assets/stylesheets/scrivito_table_widget/editing.css

@@ -25,11 +25,12 @@
 }
 
 .table-buttons.edit {
-  width: 245px;
+  width: auto;
+  z-index: 111113;
 }
 
 .table-options.main {
-  width: 350px;
+  width: auto;
 }
 
 .table-buttons.edit div.alert-gray,
@@ -70,6 +71,7 @@
 
 .table-buttons.top {
   height: 25px;
+  z-index: 111112;
 }
 
 .table-buttons.top .add-left {
@@ -84,6 +86,7 @@
 
 .table-buttons.left {
   width: 25px;
+  z-index: 111112;
 }
 
 .table-buttons.left .add-top {
@@ -107,6 +110,7 @@
 .helper-line {
   position: absolute;
   display: none;
+  z-index: 100000;
 }
 
 .delete-marker td,

data/app/assets/stylesheets/scrivito_table_widget.css

@@ -1,4 +1,5 @@
 /*
  *= require font-awesome
- *= require_tree ./scrivito_table_widget
+ *= require scrivito_table_widget/application
+ *= require scrivito_table_widget/editing
  */

data/app/views/table_widget/show.html.erb

@@ -1,13 +1,3 @@
-<% if widget.table.blank? %>
-  <%= scrivito_tag(:div, widget, :table, data: {editor: 'create-new-table'}) do %>
-    <div class="create-new-table">
-      <div class="alert alert-info">
-        There is no table present. Click this message to insert a new one.
-      </div>
-    </div>
-  <% end %>
-<% else %>
-  <div class="table-widget">
-    <%= scrivito_tag(:div, widget, :table, data: {editor: 'table-editor'}, class: 'table-responsive')%>
-  </div>
-<% end %>
+<div class="table-widget">
+  <%= scrivito_tag(:div, widget, :table, class: 'table-responsive scrivito-table-editor') %>
+</div>

data/lib/scrivito_table_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoTableWidget
-  VERSION = "0.5.7.rc2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_table_widget
 version: !ruby/object:Gem::Version
-  version: 0.5.7.rc2
+  version: 0.6.0
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: scrivito
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Scrivito Widget for a table.
 email:
 - support@scrivito.com
@@ -83,7 +55,6 @@ files:
 - app/assets/stylesheets/scrivito_table_widget.css
 - app/assets/stylesheets/scrivito_table_widget/application.css
 - app/assets/stylesheets/scrivito_table_widget/editing.css
-- app/assets/stylesheets/scrivito_table_widget/styles.css
 - app/models/table_widget.rb
 - app/views/table_widget/show.html.erb
 - app/views/table_widget/thumbnail.html.erb
@@ -91,7 +62,6 @@ files:
 - lib/scrivito_table_widget/engine.rb
 - lib/scrivito_table_widget/version.rb
 - lib/tasks/scrivito_table_widget_tasks.rake
-- scrivito/migrate/0_create_table_widget.rb
 homepage: https://www.scrivito.com
 licenses:
 - LGPL-3.0
@@ -107,9 +77,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

data/app/assets/stylesheets/scrivito_table_widget/styles.css

@@ -1,5 +0,0 @@
-/*
- *= require font-awesome
- *= require_tree .
- *= require_self
- */

data/scrivito/migrate/0_create_table_widget.rb

@@ -1,13 +0,0 @@
-class CreateTableWidget < ::Scrivito::Migration
-  def up
-    Scrivito::ObjClass.create(
-      name: 'TableWidget',
-      type: 'publication',
-      is_binary: false,
-      title: 'TableWidget',
-      attributes: [
-        {name: "table", type: "html"}
-      ],
-    )
-  end
-end