scrivito_table_widget 0.5.5 → 0.5.7.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c70e749b527d4ef71950e3c9d0ea49907db61679
-  data.tar.gz: b1e12788f67b8c2118154bbf12c9ba5e869cf87d
+  metadata.gz: ac7e97c84969651d68eb80e1b4d57910a1f43ac4
+  data.tar.gz: 9315694e6064f2fb58218f9639f6db497201d171
 SHA512:
-  metadata.gz: 48a9e0adcd59f1e429c6f2f57887c9279df26f53a3218923c1cab703dfb11ae1a7a8eb24649b02750c8ec2162b21af8fd5676bca56a2bae97f0cd9392dd75280
-  data.tar.gz: ae02fbd51ae3dc46ff6c9829819f2d8600fc4a7b41b704530e7f38a4790db22a34e144d6d37082a44aa76dd7ab1581b1ab16cb18dad1dc87c4362c07dfa7824f
+  metadata.gz: 0aa5922c14c96be32e897d5aa99ef65a2aa3939bbd4fab61c5d0472f47cfec703db6817ca3f4b8a3168a8c161b2dfd02ea89ccafb649cd38fb03234f64963dcc
+  data.tar.gz: f1cc1c05a5f9cd4d5d187b20822cbed038d0bfed0fef9ce390e61dfadd9dacbfea505dd7069bc43ba1cbdb6ccb725fb2548aef177b61392ac2473e1391276107

data/README.md

@@ -1,10 +1,6 @@
-scrivito_table_widget
-=====================
+# ScrivitoTableWidget
 
-[![Gem Version](https://badge.fury.io/rb/scrivito_table_widget.svg)](http://badge.fury.io/rb/scrivito_table_widget)
-[![Code Climate](https://codeclimate.com/github/Scrivito/scrivito_table_widget/badges/gpa.svg)](https://codeclimate.com/github/Scrivito/scrivito_table_widget)
-
-A Widget for Scrivito for a table. It is using Bootstrap 3.
+A Scrivito widget representing a table you can place onto your pages. Lets you edit table cells comfortably, add and remove rows and columns, apply different styles and more.
 
 ## Installation
 
@@ -12,22 +8,10 @@ Add this line to your application's `Gemfile`:
 
     gem 'scrivito_table_widget'
 
-Add this line to your editing javascript manifest:
+Add this line to your editing JavaScript manifest:
 
     //= require scrivito_table_widget
 
 Add this line to your application stylesheet manifest:
 
     *= require scrivito_table_widget
-
-## Changelog
-See [Changelog](https://github.com/Scrivito/scrivito_table_widget/blob/master/CHANGELOG.md) for more
-details.
-
-## Contributing
-
-1. Fork it ( https://github.com/Scrivito/scrivito_table_widget/fork )
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new Pull Request

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

@@ -19,25 +19,32 @@
       rows = $.fn.edittable.getRowCount();
       cols = $.fn.edittable.getColCount();
       $.fn.edittable.bindButtons();
-    } else if(activeElement.get(0) != this.get(0)) {
-      //$.fn.edittable.save(cmsField);
     }
 
     if(!keysBound) {
       $.fn.edittable.bindKeys();
     }
 
+    var elem = this;
+
+    if($(this).get(0).tagName != "TD" && $(this).get(0).tagName != "TH") {
+      elem = elem.parents('td, th');
+    }
+
     // edit
-    if($(this).get(0).tagName == "TD" || $(this).get(0).tagName == "TH") {
-      activeElement = this;
-      cmsField.attr('contenteditable', true);
-      $.fn.edittable.setButtonPositions();
+    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();
+      }
     }
   };
 
   $.fn.edittable.bindKeys = function() {
     $('body').keyup(function(e) {
       var code = e.keyCode || e.which;
+      $.fn.edittable.save();
       if(initialized) {
         $.fn.edittable.setButtonPositions();
       }
@@ -73,7 +80,7 @@
     }
   }
 
-  $.fn.edittable.initialize = function(cmsField, element) {    
+  $.fn.edittable.initialize = function(cmsField, element) {
     var buttons_top = "<div class='table-buttons top'>"+ $.fn.edittable.buttonsTop() +"</div>";
     var buttons_bottom = "<div class='table-buttons bottom'>"+ $.fn.edittable.buttonsBottom() +"</div>";
     var buttons_left = "<div class='table-buttons left'>"+ $.fn.edittable.buttonsLeft() +"</div>";
@@ -117,11 +124,6 @@
 
   $.fn.edittable.buttonsEdit = function() {
     return  $.fn.edittable.button("pencil", "", "edit-the-cell alert-gray") +
-            $.fn.edittable.button("bold", "", "table-bold alert-gray") +
-            $.fn.edittable.button("italic", "", "table-italic alert-gray") +
-            $.fn.edittable.button("align-left", "", "table-left alert-gray") +
-            $.fn.edittable.button("align-center", "", "table-center alert-gray") +
-            $.fn.edittable.button("align-right", "", "table-right alert-gray") +
             $.fn.edittable.button("crosshairs", "", "add-success alert-success") +
             $.fn.edittable.button("crosshairs", "", "add-info alert-info") +
             $.fn.edittable.button("crosshairs", "", "add-warning alert-warning") +
@@ -178,9 +180,6 @@
     $('.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('.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('.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'); });
@@ -188,7 +187,6 @@
     $('.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)); });
 
@@ -261,18 +259,8 @@
     }
    }
 
-  $.fn.edittable.bold = function() {
-    activeElement.toggleClass('bold');
-    $.fn.edittable.save(cmsField);
-  }
-
-  $.fn.edittable.italic = function() {
-    activeElement.toggleClass('italic');
-    $.fn.edittable.save(cmsField);
-  }
-
   $.fn.edittable.addTop = function() {
-    var newRow = activeElement.parents('tr').get(0).outerHTML;
+    var newRow = "<tr>"+ new Array(cols + 1).join("<td>Content</td>"); +"</tr>";
 
     $(newRow).insertBefore( activeElement.parents('tr') );
     rows += 1;
@@ -283,12 +271,7 @@
   $.fn.edittable.addBottom = function() {
     var newRow = "<tr>"+ new Array(cols + 1).join("<td>Content</td>"); +"</tr>";
 
-    if(activeElement.get(0).tagName == 'TD') {
-      $(newRow).insertAfter( activeElement.parents('tr') );
-    } else {
-      $(newRow).insertBefore( activeTable.find('tbody tr').first() );
-    }
-
+    $(newRow).insertAfter( activeElement.parents('tr') );
     rows += 1;
     $.fn.edittable.setButtonPositions();
     $.fn.edittable.save(cmsField);

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

@@ -5,7 +5,7 @@
     App.tableEditor = {
       // set selector for Editor
       selector: '[data-editor=table-editor]',
-            
+
       // set function triggert on click
       clickFunction: function(cmsField) {
         cmsField.edittable();

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

@@ -131,4 +131,9 @@ td.active-field {
 .table-options.main div:first-child,
 .table-buttons.edit div:first-child {
   display: block;
-}
+}
+
+[data-scrivito-display-mode='editing'] table td:focus,
+[data-scrivito-display-mode='editing'] table th:focus {
+  outline: 2px dotted #439439 !important;
+}

data/app/models/table_widget.rb

@@ -1,3 +1,3 @@
 class TableWidget < Widget
-  attribute :table, :html
+  attribute :table, :html, default: "<table class='table'><thead><tr><th>Headline</th><th>Headline</th></tr></thead><tbod><tr><td>Content</td><td>Content</td></tr><tr><td>Content</td><td>Content</td></tr></tbody></table>"
 end

data/lib/scrivito_table_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoTableWidget
-  VERSION = "0.5.5"
+  VERSION = "0.5.7.rc1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_table_widget
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7.rc1
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,9 +78,7 @@ files:
 - Rakefile
 - app/assets/images/table.png
 - app/assets/javascripts/scrivito_table_widget.js
-- app/assets/javascripts/scrivito_table_widget/createTable.js
 - app/assets/javascripts/scrivito_table_widget/jquery.edit.table.js
-- app/assets/javascripts/scrivito_table_widget/scripts.js
 - app/assets/javascripts/scrivito_table_widget/tableEditor.js
 - app/assets/stylesheets/scrivito_table_widget.css
 - app/assets/stylesheets/scrivito_table_widget/application.css
@@ -109,12 +107,12 @@ 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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Scrivito Widget for a table.

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

@@ -1,21 +0,0 @@
-(function($, App) {
-  'use strict';
-
-  $(function() {
-    var tableString = '<table class="table"><thead><tr><th>New Table</th></tr></thead><tbody><tr><td>With Content</td></tr></body></table>';
-
-    if(scrivito.in_editable_view()) {
-      $('body').on('click', '.create-new-table', function(e) {
-        $(this).removeClass('create-new-table');
-        $(this).addClass('table');
-
-        $(this).html(tableString);
-
-        $(this).parent().scrivito('save', tableString);
-
-        $(this).parent().scrivito('reload');
-      });
-    } // end if
-  });
-
-})(jQuery, this);

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

@@ -1,13 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require_tree ./