simple_form_attachments 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20fff88df741e411c95ed3fedf922493973e648f
-  data.tar.gz: f794f357a9e3c1182bf16395f1c1b9559ebc04b9
+  metadata.gz: 5438c1e936aadfb3a6f0c480c7e5924c0daaf827
+  data.tar.gz: 161f086f633ff44dd4d899be439aafe0b0bbec68
 SHA512:
-  metadata.gz: 0f559414630de4992c5ad1a4ea18f8f47d7e23c30c7f48ed63156d6195a28e4cedc924019b6b7bcb413fb9ce7ef18bea593272d931abc28912dc6ededeba32fb
-  data.tar.gz: 18348f0b5fbbc40d441535d0667239e0cfe389c7e387eab25eaafa719b27a2a3dc038193cb70910b968a2f18eca417d98fbc65f058d3fe4731a6e5c133b4aca3
+  metadata.gz: 67a75e03e65a81babea65304df653c22d169f26de17efa41e4fb9cc815339e87c8f06f03db2291d61843feca515e5dd829395b9a7e74955b200eb00c7598ae24
+  data.tar.gz: fafeda901c327e9488230f7f4a948f53145f4c04cf94d56f175ecc413fb77059c20f8a43efa88ff991092c98bf21f296437be30a09bfaea607afa1e9a7f50d6e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_form_attachments (0.0.9)
+    simple_form_attachments (0.1.0)
       jquery-ui-rails
       rails (>= 4.2)
       rails-assets-blueimp-file-upload (>= 9.6.0)
@@ -49,7 +49,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    arel (6.0.2)
+    arel (6.0.3)
     bson (3.1.2)
     builder (3.2.2)
     coderay (1.1.0)
@@ -71,7 +71,7 @@ GEM
     erubis (2.7.0)
     ffi (1.9.10)
     formatador (0.2.5)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     guard (2.12.8)
       formatador (>= 0.2.4)
@@ -145,12 +145,12 @@ GEM
       railties (= 4.2.3)
       sprockets-rails
     rails-assets-blueimp-canvas-to-blob (2.2.0)
-    rails-assets-blueimp-file-upload (9.10.5)
+    rails-assets-blueimp-file-upload (9.11.0)
       rails-assets-blueimp-canvas-to-blob (>= 2.1.1)
       rails-assets-blueimp-load-image (>= 1.13.0)
       rails-assets-blueimp-tmpl (>= 2.5.4)
       rails-assets-jquery (>= 1.6)
-    rails-assets-blueimp-load-image (1.13.1)
+    rails-assets-blueimp-load-image (1.14.0)
     rails-assets-blueimp-tmpl (2.5.5)
     rails-assets-handlebars (3.0.3)
     rails-assets-jquery (2.1.4)
@@ -188,7 +188,7 @@ GEM
       temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
-    sprockets (3.2.0)
+    sprockets (3.3.2)
       rack (~> 1.0)
     sprockets-rails (2.3.2)
       actionpack (>= 3.0)

data/lib/assets/javascripts/simple_form_attachments/simple_form_attachments.js.coffee

@@ -9,9 +9,20 @@
   defaults =
     debug: false
     sortable_options:
-      items: 'tr'
       handle: '.handle'
       axis: 'y'
+      items: '> tr'
+      forcePlaceholderSize: true
+      placeholder: 'attachment-placeholder'
+      start: (event, ui) ->
+        cellCount = 0
+        $('td, th', ui.helper).each ->
+          colspan = 1
+          colspanAttr = $(this).attr('colspan')
+          if colspanAttr > 1 then colspan = colspanAttr
+          cellCount += colspan
+        ui.placeholder.html '<td colspan="#{cellCount}">&nbsp;</td>'
+
     slide_speed: 'fast'
 
   # ---------------------------------------------------------------------
@@ -34,7 +45,8 @@
       @init_fileupload()
 
     init_sortable: () ->
-      @get_attachment_list().sortable(@options.sortable_options)
+      @get_attachment_list().add( @get_attachment_list().find('th, td') ).each -> $(this).outerWidth $(this).outerWidth()
+      @get_attachment_list().find('tbody').sortable(@options.sortable_options).disableSelection()
 
     init_fileupload: () ->
       console.log "init jQuery.fileupload" if @options.debug
@@ -83,6 +95,7 @@
         fail: (e, data) =>
           @set_logs(e, data) if @options.debug
           $result = $(JSON.parse(data.jqXHR.responseText).html).addClass('has_error')
+          $result.find('td.errors').attr('colspan', '3');
           data.context.replaceWith($result)
 
         progress: (e, data) =>

data/lib/simple_form_attachments/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormAttachments
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/test/dummy/app/assets/stylesheets/tests.scss

@@ -34,6 +34,7 @@ body {
   @include default-font-size;
 }
 
+
 // --------------------------------------------------------------------
 
 input[type="file"] {
@@ -51,10 +52,11 @@ div.input.attachment {
   }
 
   table.attachments.list {
+    width: 100%;
     margin-bottom: $default-line-height;
     border-collapse: collapse;
-    width: 100%;
-    box-sizing: border-box;
+
+    // ---------------------------------------------------------------------
 
     &.sortable {
       tr.attachment {
@@ -64,31 +66,51 @@ div.input.attachment {
       }
     }
 
+    // ---------------------------------------------------------------------
+
+    tr.attachment-placeholder,
     tr.attachment {
-      height: $image-height + ($padding-large*2);
       width: 100%;
+      height: $image-height + ($padding-large*2);
+    }
+
+    tr.attachment {
       background-color: #eee;
       border-bottom: 1px solid white;
-      border-left: 0;
 
       &.has_error {
         color: red;
         background-color: pink;
+        width: 100%;
         height: $image-height + ($padding-large*2);
 
         td.handle {
+          color: transparent;
+          text-shadow: none;
           border-right: 0;
-
-          &:before,
-          &:after {
-            display: none;
-          }
         }
       }
 
       td.handle {
         display: none;
-        box-sizing: border-box;
+        content: '....';
+        border-right: 1px solid #FFF;
+        padding: 0 $padding $padding-large $padding;
+        overflow: hidden;
+        cursor: move;
+        margin-top: -20px;
+        vertical-align: middle;
+        font-size: 12px;
+        line-height: 5px;
+        font-family: sans-serif;
+        letter-spacing: 2px;
+        color: #aaa;
+        text-shadow: 1px 0 1px #eee;
+        width: 10px;
+
+        &:after {
+          content: '.. .. .. ..';
+        }
       }
 
       td.hidden {
@@ -96,7 +118,6 @@ div.input.attachment {
       }
 
       td {
-        box-sizing: border-box;
         padding: $padding-large;
 
         &:first-child {
@@ -111,19 +132,6 @@ div.input.attachment {
         }
       }
 
-      td.handle {
-        width: 18px;
-        vertical-align: middle;
-        color: #aaa;
-        cursor: move;
-        border-right: 1px solid white;
-        padding: 0 $padding;
-
-        &:before {
-          content: "░";
-        }
-      }
-
       td.thumb {
         width: $image-height + ($padding-large*2);
 
@@ -216,5 +224,3 @@ div.input.attachment {
     outline: 6px solid yellow;
   }
 }
-
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_attachments
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails