instant-upload 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f59a9daabc53c2fecdfc404da75af9af990744
-  data.tar.gz: 1f7598a779fef802e3f728b2f2c99bdc20e8308f
+  metadata.gz: 2f9159754dd8e297f07b7c7d6ab580946ffb6d95
+  data.tar.gz: 6bc6162cd19a1821e78b8fe0896c99b25578761c
 SHA512:
-  metadata.gz: bbb16e632445148a0efe90577eb5b7d3f63271e092afa14bc7915a3d6b31de03375cf55851fcab25ac01b92fa6d37d78dfddfd912438835e8b4f42b4114c421a
-  data.tar.gz: 16d04780ed932ac504317d1d4b58e94eafa41ac7dd78b573961649217c8b70f2eecff41bc21c5df73bf35ecc2957531aca496f85f151013a7397e31b7fe99cd5
+  metadata.gz: 5274617e2cb0f161b2d80247a5b79d119863c0169dab4f09fd646cafe467bf813029fec781708e72526bb9844ee51bf75e4ce6500f10791e87669b9afba0872c
+  data.tar.gz: 738c16d2c96d94bdad90372f435ffbfc159176042ed23fda9fedbb8d014eeb57334cc5f18803e1fd57c920600403e49e2a79ef045f58da5ac0a8b0b9275c6be8

data/app/assets/javascripts/instant_upload.js

@@ -2,3 +2,58 @@
 
 //= require instant_upload/single
 //= require instant_upload/multi
+
+/**
+ * jQuery Unveil
+ * A very lightweight jQuery plugin to lazy load images
+ * http://luis-almeida.github.com/unveil
+ *
+ * Licensed under the MIT license.
+ * Copyright 2013 Luís Almeida
+ * https://github.com/luis-almeida
+ */
+
+;(function($) {
+
+  $.fn.unveil = function(threshold) {
+
+    var $w = $(window),
+        th = threshold || 0,
+        retina = window.devicePixelRatio > 1,
+        attrib = retina? "data-src-retina" : "data-src",
+        images = this,
+        loaded,
+        inview,
+        source;
+
+    this.one("unveil", function() {
+      source = this.getAttribute(attrib);
+      source = source || this.getAttribute("data-src");
+      if (source) this.setAttribute("src", source);
+    });
+
+    function unveil() {
+      inview = images.filter(function() {
+        var $e = $(this),
+            wt = $w.scrollTop(),
+            wb = wt + $w.height(),
+            et = $e.offset().top,
+            eb = et + $e.height();
+
+        return eb >= wt - th && et <= wb + th;
+      });
+
+      loaded = inview.trigger("unveil");
+      images = images.not(loaded);
+    }
+
+    $w.scroll(unveil);
+    $w.resize(unveil);
+
+    unveil();
+
+    return this;
+
+  };
+
+})(jQuery);

data/app/assets/javascripts/instant_upload/multi.js.coffee

@@ -33,9 +33,9 @@ app = angular.module('instantUpload', [])
           cursor: 'pointer'
           position: 'absolute'
           left: offset.left
-          top: offset.top
+          top: $('.iu-multi-dropzone').outerHeight() / 2 + $selectFiles.outerHeight() / 2
           width: $selectFiles.width() + 10
-          height: $selectFiles.height() + 10
+          height: $selectFiles.outerHeight() * 2
           'margin-left': -5
           'margin-top': -25
           'z-index': 2
@@ -151,6 +151,17 @@ app = angular.module('instantUpload', [])
         $this = $(this)
         $scope.files.push { path: $this.find('img').attr('src'), id: $this.data('id') }
 
-  $ -> $scope.init($($element)) if !!window.FormData
+  $scope.remove = (index) ->
+    $scope.files.splice(index, 1)
+
+    file = $scope.files[index]
+
+    $.ajax
+      url: $($element).parents('form').attr('action')
+      method: 'POST'
+      data: {iu_remove: true, index: index, offer: { id: 'true' } }
+
+  $ ->
+    $scope.init($($element)) if !!window.FormData
 
 ]

data/app/views/instant_upload/_multi.html.haml

@@ -4,17 +4,18 @@
     = file_field_tag "#{record.class.name.downcase}[#{field}_attributes][][#{options[:multi]}]", multiple: true
 
     .iu-multi-select
-      drag & drop or
-      = link_to 'select file from disk', '#', class: 'iu-multi-select-files'
+      = t 'instant_upload.drag_and_drop'
+      = link_to t('instant_upload.select_files'), '#', class: 'iu-multi-select-files'
 
   %ul.iu-multi-files-cache
     - record.send(field).each do |img|
       %li{ data: { id: img.id } }= image_tag img.send(options[:multi]).send(options[:version]).url
 
-  .iu-alert Too much, only #{options[:limit]}
+  .alert.iu-alert= t 'instant_upload.too_much', limit: options[:limit]
 
   %ul.iu-multi-files
     %li{ 'ng-repeat' => 'file in files'}
       %img{ src: "{{ file.path }}" }
+      %a{ 'ng-click' => 'remove($index)'}= t 'instant_upload.remove'
 
 

data/config/locales/instant_upload.pl.yml

@@ -0,0 +1,4 @@
+pl:
+  instant_upload:
+    drag_and_drop: Upuść pliki tutaj lub
+    select_files: wybierz je z dysku.

data/lib/instant_upload/helpers/controller_helper.rb

@@ -5,7 +5,7 @@ module InstantUpload
       extend ActiveSupport::Concern
 
       included do
-        helper_method :handle_upload, :load_uploaded_files, :clear_uploaded_files
+        helper_method :handle_upload, :load_uploaded_files, :clear_uploaded_files, :remove_uploaded_file
       end
 
       def handle_upload(record, field, options ={})
@@ -23,7 +23,7 @@ module InstantUpload
             end
 
             session[sesssion_key] = [] if session[sesssion_key].blank?
-            session[sesssion_key] << files.map { |f| f.id }
+            session[sesssion_key] = files.map { |f| f.id }
 
             render json: record.send(field)
           else
@@ -38,6 +38,10 @@ module InstantUpload
 
           return true
         else
+           if remove_uploaded_file(record, field)
+            render json: true
+            return true
+          end
           load_uploaded_files(record, field, options)
         end
 
@@ -66,6 +70,19 @@ module InstantUpload
         session.delete("#{record.class.name.downcase}_#{field}")
       end
 
+      def remove_uploaded_file(record, field)
+        sesssion_key = "#{record.class.name.downcase}_#{field}"
+
+        if params[:iu_remove].present?
+          logger.info 'remove media'
+          logger.info session[sesssion_key].inspect
+          session[sesssion_key].delete_at params[:index].to_i
+          return true
+        end
+
+        false
+      end
+
     end
 
   end

data/lib/instant_upload/version.rb

@@ -1,3 +1,3 @@
 module InstantUpload
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instant-upload
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Mariusz Ołownia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -283,6 +283,7 @@ files:
 - app/views/instant_upload/_multi.html.haml
 - app/views/instant_upload/_single.html.haml
 - app/views/layouts/instant_upload/application.html.erb
+- config/locales/instant_upload.pl.yml
 - config/routes.rb
 - db/migrate/20130509140233_create_instant_upload_uploads.rb
 - lib/generators/instant_upload/install_generator.rb