assetable 0.1.10 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFjYWI5NzVhMGUzYjhiNjEzMDdmNzJkYmYzY2ZjZDQyMDQ4ZjY4OQ==
+    M2ZiYjc4YjE3M2Q5MmU4OWNlOTc3OGM2MWUzZThhMmUyOTNiOGUyZg==
   data.tar.gz: !binary |-
-    YWM4OTJiYjY3NWNmODZiODdmNmI1NTZkN2Y1OTM1Y2RkOWY5YmQ4MA==
+    MmFmOWFmZDE5YTEwZTZlZTNhYzNiNGNjOWJmMDNkYTEyMGNmMjRlNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzljYzI4YzE2YWJhOGE1MWNlYTg5YmIxMWI2NmRiZWY1ZjU2YTA4OThmOGUx
-    ZDZhZWU2MGYzYzE0NTVkODYwZmZlOWFkOGI4NjczMjFiYzc4NWI5Y2FkMTBm
-    YjM0YzEyMzAxMWQ4MTkwNGVhM2FmOWQ2YmZjYWNhMjhiYWI1YTA=
+    YjlmODEyNDc5NTM5ZTk3NDE1NDEzNTlhN2QwZGIyNzE0YTI0MGQ0YmEwY2Uy
+    ZDc3Njk0NGRiNTZjZWM5MWQ0MWE3YTM0MjY3MTdhZDlhYWMwYmE5NTVlYWE3
+    NTQyZGQxMTdmZGZiYzA4YjMzNmQxNzMyMGQzNDhiNjQ4M2NmMDc=
   data.tar.gz: !binary |-
-    ZTZiZGNiMWQyOGJiYzJhYTE3NjViNWI2OWFiYzYzNGI1NmM4OGI5ZmI0NTQx
-    MzJkN2MwMGI0ZmZkYTY1MWNlZGZiODJiNTk5ZDQzYTI1MjE1ZTliYjlkMjk0
-    ZjBlMzdjMzVlYTdjYmZiNGExZjRlZGNhMTg0MDVlMTE4N2FiY2E=
+    YjliMzQ3MDljMzdlZGM3MjgwNWU3MzVmY2ZhNGEwN2QzYjRhZTg0Y2M0NzU4
+    Y2UzNDUxMWE3MjFlNWVkN2RjOGIzZDkzM2VhN2MwYzgxYWYzNGFkOThlYjJl
+    YjY4Y2I0OWRlZDMzYzJhNmI3YTU4MTllNTg1MTM2NTdjMzA2NTU=

data/README.rdoc

@@ -1,6 +1,8 @@
 = Assetable
 
-Easily add Assets to your Active Record models, including images, videos and almost any kind of documents. Includes an uploader, media gallery and much more.
+Easily add Assets to your Rails app, including images, videos and almost any kind of documents. Includes an uploader, media gallery and much more.
+
+This is still an early beta release. While the majority of uploading works, the media gallery selector is still in an early alpha.
 
 === Installation
 
@@ -8,7 +10,7 @@ Easily add Assets to your Active Record models, including images, videos and alm
 
 Add this line to your application's Gemfile:
 
-    gem 'bootstrap_sass_rails'
+    gem 'assetable'
 
 And then execute:
 
@@ -16,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install bootstrap_sass_rails
+    $ gem install assetable
     
     
 ==== Migrations    
@@ -38,7 +40,7 @@ Add the Stylesheet and Javascripts to your project:
     
 Javascript:
 
-    //= import uploader
+    //= require assetable/assetable
 
 
 ==== Configuration
@@ -152,12 +154,12 @@ In order to start uploading assets, you'll need to add the uploader to your form
 
     = form_for @user do |f|
       ...
-      = f.uploader :avatar
+      = f.input :avatar, as: :uploader
       ...
 
     # You can also pass typical params to the uploader
     = form_for @user do |f|
-      = f.uploader :avatar, class: "classname", id: "something-else"
+      = f.inputer :avatar, as: :uploader, input_html: { class: "classname", id: "something-else" }
       
 Make sure the assetable uploader javascript is added.
 
@@ -166,7 +168,7 @@ Make sure the assetable uploader javascript is added.
 
     = form_for @user do |f|
       ...
-      = f.gallery :gallery
+      = f.input :gallery, as: :gallery
       ...
       
 It's that easy!

data/app/assets/javascripts/assetable/assetable.js.coffee

@@ -0,0 +1,16 @@
+#= require_self
+
+#= require moxie
+#= require plupload.dev
+#= require plupload.settings
+#= require jquery.plupload.queue
+#= require vendor/jquery-ui-1.10.3.custom
+#= require vendor/bootstrap-modal
+
+
+#= require assetable/assetable_uploader
+#= require assetable/uploader
+#= require assetable/gallery
+#= require assetable/asset_gallery
+
+window.Assetable = {}

data/app/assets/javascripts/assetable/assetable_uploader.js.coffee

@@ -19,37 +19,47 @@
       max_file_count: 0
       unique_names: true
       url: null
+      uploader_id: null
     
     assetable_uploader = this
 
     init = ->
       # merge the options with the defaults
       assetable_uploader.options = jQuery.extend({}, defaults, options)
-      assetable_uploader.id = assetable_uploader.attr('id')
+      
+      hidden_field = $(assetable_uploader).find('input[type="hidden"].assetable-uploader-input')
+      assetable_uploader.options.fieldname = hidden_field.attr('name')
+      assetable_uploader.options.uploader_id = hidden_field.attr('id')
+      $(hidden_field, assetable_uploader).remove() if assetable_uploader.options.gallery
+
+      $(assetable_uploader).attr('id', assetable_uploader.options.uploader_id)
+      $(assetable_uploader).find('.browse-btn').attr('id', "#{assetable_uploader.options.uploader_id}-browse-btn")
+      $(assetable_uploader).find('.drop-element').attr('id', "#{assetable_uploader.options.uploader_id}-drop-element")
+      
+      # Add parameters to third party button
+      third_party_btn = $(assetable_uploader).find('.btn-third-party')
+      $(third_party_btn).attr('href', $(third_party_btn).attr('href') + "?fieldname=#{assetable_uploader.options.fieldname}&uploader_id=#{assetable_uploader.options.uploader_id}")
+
       bind_uploader()
 
     
     bind_uploader = ->
 
       # Create our extra HTML for the copy and queu
-      # upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy">Drag and drop files or <a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">add them manually</a></div></div>'
-      # upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy"><a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">select file</a> or <a href="#" class="btn-open-asset-gallery">open gallery</a></div></div>'
-      upload_directions = '<div class="uploader-directions" id="' + assetable_uploader.id + '-drop-area"><div class="uploader-directions-image"></div><div class="uploader-directions-copy"><a href="#" class="browse-btn" id="' + assetable_uploader.id + '-browse-btn">select file</a> ' + assetable_uploader.options.directions + '</div></div>'
       upload_queue = '<ul class="upload-queue"></ul>'
       # Add to the uploader
-      $(assetable_uploader).append(upload_directions)
       $(assetable_uploader).append(upload_queue)
 
 
       # Instantiate the uploader
       uploader = new plupload.Uploader(
         runtimes: "html5"
-        browse_button: "#{assetable_uploader.id}-browse-btn"
+        browse_button: "#{assetable_uploader.options.uploader_id}-browse-btn"
         url: assetable_uploader.options.url
         max_file_size: assetable_uploader.options.max_file_size
         unique_names: assetable_uploader.options.unique_names
         dragdrop: assetable_uploader.options.drag_drop
-        drop_element: assetable_uploader.id
+        drop_element: assetable_uploader.options.uploader_id
         multiple_queues: assetable_uploader.options.multiple_queues
         multi_selection: assetable_uploader.options.multi_selection
         max_file_count: assetable_uploader.options.max_file_count
@@ -57,27 +67,26 @@
         multipart_params:
           authenticity_token: assetable_uploader.options.authenticity_token
           fieldname: assetable_uploader.options.fieldname
+          gallery: assetable_uploader.options.gallery
+          uploader_id: assetable_uploader.options.uploader_id
 
         # Filter file types
-        # filter: [
-        #   title: "Image files"
-        #   extensions: "jpg,gif,png"
-        # ,
-        #   title: "Video files"
-        #   extensions: "mov,mp4,mpeg4"
-        # ]
+        filters:
+          mime_types : [
+            title: "Image files"
+            extensions: "jpg,gif,png"
+          ,
+            title: "Video files"
+            extensions: "mov,mp4,mpeg4"
+          ,
+            title: "Zip Files"
+            extensions: "zip"
+          ]
+          max_file_size: assetable_uploader.options.max_file_size
+          prevent_duplicates: true
       )  
       
       
-  
-      # # Uploader Template
-      # template = "<div class=\"current_preview current_" + uploader_id + "\">" + content + "</div>" + "<div class=\"koh_pluploader\" id=\"" + uploader_id + "_drop_area\">" + "<a id=\"" + uploader_id + "_browse_btn\" href=\"#\"><span class=\"link_color\">Attach files by dragging & dropping them here</span> or add them manually</a>" + "<ul class=\"upload_queue\"></ul>" + "</div>" + ((if allow_select_mg then "<a href=\"#\" class=\"attach_image\" uid=\"" + uploader_id + "\" target=\"" + container + "\">select from media gallery</a>" else ""))
-      
-      # # Initialize binding
-      # uploader.bind "Init", (up, params) ->
-      #   $("#" + container).html template
-
-      
       # # Initiate the uploader
       uploader.init()
       
@@ -94,9 +103,7 @@
       
       # Listen for upload complete
       uploader.bind "FileUploaded", (up, file, info) ->
-        if assetable_uploader.options.FileUploaded
-          json = jQuery.parseJSON(info.response)
-          assetable_uploader.options.FileUploaded json
+        eval(info.response)
         $("li#" + file.id, assetable_uploader).fadeOut().remove()
 
       
@@ -104,10 +111,11 @@
       uploader.bind "QueueChanged", (up, files) ->
         uploader.start()
         up.refresh()
+      
       # # Listen for errors
-      # uploader.bind "Error", (up, err) ->
-      #   $("#" + container).append "<div class=\"notice error\">" + "<span class=\"block\">Error: " + err.code + "</div>" + "<span class=\"block\">Message: " + err.message + "</div>" + ((if err.file then "<span clas=\"block\">" + err.file.name + "</span>" else "")) + "</div>"
-      #   up.refresh() # Reposition Flash/Silverlight
+      uploader.bind "Error", (up, err) ->
+        
+
 
       draggable_selector = (if assetable_uploader.options.gallery then $('.uploader-directions', assetable_uploader) else $(assetable_uploader))
 
@@ -132,27 +140,8 @@
       $(assetable_uploader).on "click", ".btn-uploader-remove-asset", (e)->
         e.preventDefault()
         if assetable_uploader.options.fileRemoved
-          assetable_uploader.options.fileRemoved this, assetable_uploader
-
-
-      $(assetable_uploader).on "click", ".btn-uploader-edit-asset", (e)->
-        e.preventDefault()
-        $.ajax
-          url: $(this).attr('href')
-          data: {fieldname: assetable_uploader.options.fieldname}
-          type: 'GET'
+          assetable_uploader.options.fileRemoved assetable_uploader, this
 
-          success: (response)->
-            $response = $(response)
-            $response.modal()
-
-            $('form.form-edit-asset').on 'ajax:beforeSend', ()->
-                # console.log "form submitting..."                
-
-            $('form.form-edit-asset').on 'ajax:success', (data, status, xhr)->
-              if status.success
-                $response.modal('hide').remove()
-                assetable_uploader.options.fileUpdated status
 
 
       $(assetable_uploader).on "click", ".btn-open-asset-gallery", (e)->
@@ -161,75 +150,8 @@
         # if assetable_uploader.options.openAssetGallery
         #   assetable_uploader.options.openAssetGallery this, assetable_uploader
       
-      # $(assetable_uploader).on "click", ".btn-third-party-service", (e)->
-      #   e.preventDefault()
-      #   console.log "boom"
-
-
-      # Add a third party service
-      $(assetable_uploader).on "click", ".btn-third-party-service", (e)->
-        e.preventDefault()
-        $.ajax
-          url: $(this).attr('href')
-          data: {fieldname: assetable_uploader.options.fieldname}
-          type: 'GET'
-
-          success: (response)->
-            $response = $(response)
-            $response.modal()
-
-            $('form#new_external_service').on 'ajax:beforeSend', ()->
-                # console.log "form submitting..."                
-
-            $('form#new_external_service').on 'ajax:success', (data, status, xhr)->
-              if status.success
-                $response.modal('hide').remove()
-                assetable_uploader.options.FileUploaded status
-                
-
-
-
+    
 
     init()
 
-) jQuery
-
-
-
-
-bind_uploaders = ->
-  # Bind the koh uploader and galleries to a page
-  $(".uploader").each ->
-    # Check that it's not already bound
-    unless $(this).hasClass("uploadable")
-      $(this).addClass "uploadable"
-      $this = $(this)
-      $this.removeClass "uploader"
-      
-      field = $this.attr("data-uploader-input-name")
-
-      $this.assetable_uploader
-        multi_selection: false
-        url: "/assetable/assets"
-        fieldname: field
-        directions: $this.attr('data-uploader-directions')
-        max_file_size: $this.attr("data-max-file-size")
-        authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
-        onUploaded: (resp) ->
-          $this.find('.uploader-data-wrapper').html(resp.html)
-          $this.addClass("uploader-has-asset")
-        fileRemoved: (button, item) ->
-          return false unless $(item).hasClass("uploader-has-asset")
-          $('.uploader-preview', item).html('<input type="hidden" name="' + field + '" />')
-          $(item).removeClass("uploader-has-asset")
-        fileUpdated: (resp) ->
-          $this.find('div.uploader-preview[data-asset-id="' + resp.id + '"]').replaceWith(resp.html)
-        # openAssetGallery: (button, item) ->
-
-
-
-window.Assetable.bind_uploaders = bind_uploaders
-
-$(document).ready ->
-            
-  window.Assetable.bind_uploaders()
+) jQuery

data/app/assets/javascripts/assetable/gallery.js.coffee

@@ -1,4 +1,5 @@
 bind_galleries = ->
+
   # Bind the koh uploader and galleries to a page
   $(".gallery-uploader").each ->
     # Check that it's not already bound
@@ -6,21 +7,16 @@ bind_galleries = ->
       $(this).addClass "uploadable"
       $this = $(this)
       $this.removeClass "uploader"
-      
-      field = $this.attr("data-uploader-input-name")
 
       $this.assetable_uploader
         multi_selection: true
         gallery: true
-        url: "/assetable/assets"
-        fieldname: field
+        url: "/assetable/assets.js"
         authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
-        onUploaded: (resp) ->
-          $this.find('.uploader-data-wrapper').append(resp.html)
-        fileRemoved: (button, item) ->
-          $(button).closest('.uploader-preview').remove()
-        fileUpdated: (resp) ->
-          $this.find('div.uploader-preview[data-asset-id="' + resp.id + '"]').replaceWith(resp.html)
+        fileRemoved: (item, button) ->
+          $(button).parentsUntil('.uploader-preview').parent().find('.assetable-gallery-item-remove').val('1')
+          $(button).parentsUntil('.uploader-preview').parent().fadeOut()
+
 
         # Make the gallery sortable
         $(this).sortable
@@ -28,10 +24,16 @@ bind_galleries = ->
           distance: 50
           tolerance: 'pointer'
           placeholder: 'uploader-sortable-placeholder'
+          update: (event, ui) ->
+            $gallery = $(this)
+
+            $('input.assetable-gallery-item-sort-order', $gallery).each (index) ->
+              $(this).val(index)
 
 
 window.Assetable.bind_galleries = bind_galleries
 
+
 $(document).ready ->
 
   window.Assetable.bind_galleries()

data/app/assets/javascripts/assetable/uploader.js.coffee

@@ -1,14 +1,30 @@
-#= require_self
+bind_uploaders = ->
 
-#= require moxie
-#= require plupload.dev
-#= require plupload.settings
-#= require jquery.plupload.queue
-#= require vendor/jquery-ui-1.10.3.custom
-#= require vendor/bootstrap-modal
+  $('.assetable-uploader').each ->
+    unless $(this).hasClass("uploadable")
+      $(this).addClass "uploadable"
+      $this = $(this)
+      $this.removeClass "assetable-uploader"
 
-#= require assetable/assetable_uploader
-#= require assetable/gallery
-#= require assetable/asset_gallery
+      $this.assetable_uploader
+        multi_selection: false
+        url: "/assetable/assets.js"
+        # directions: $this.attr('data-uploader-directions')
+        # max_file_size: $this.attr("data-max-file-size")
+        authenticity_token: $("meta[name=\"csrf-token\"]").attr("content")
+        fileRemoved: (item, button) ->
+          # Remove the asset preview and input when removed. No need
+          # to add an empty input as one already exists in the DOM
+          $('.uploader-preview', item).html('')
 
-window.Assetable = {}
+
+window.Assetable.bind_uploaders = bind_uploaders
+
+$(document).ready ->
+            
+  window.Assetable.bind_uploaders()
+
+  # Remove assetable modals on close
+  $(document).on "hidden.bs.modal", ".assetable-modal", ->
+    $(this).remove()
+    return

data/app/assets/javascripts/vendor/jquery-ui-1.10.3.custom.js

@@ -1,7 +1,7 @@
-/*! jQuery UI - v1.10.3 - 2013-12-03
+/*! jQuery UI - v1.10.4 - 2014-02-17
 * http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.sortable.js
-* Copyright 2013 jQuery Foundation and other contributors; Licensed MIT */
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.selectable.js, jquery.ui.sortable.js
+* Copyright 2014 jQuery Foundation and other contributors; Licensed MIT */
 
 (function( $, undefined ) {
 
@@ -12,7 +12,7 @@ var uuid = 0,
 $.ui = $.ui || {};
 
 $.extend( $.ui, {
-	version: "1.10.3",
+	version: "1.10.4",
 
 	keyCode: {
 		BACKSPACE: 8,
@@ -411,7 +411,7 @@ $.widget = function( name, base, prototype ) {
 		// TODO: remove support for widgetEventPrefix
 		// always use the name + a colon as the prefix, e.g., draggable:start
 		// don't prefix for widgets that aren't DOM-based
-		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
+		widgetEventPrefix: existingConstructor ? (basePrototype.widgetEventPrefix || name) : name
 	}, proxiedPrototype, {
 		constructor: constructor,
 		namespace: namespace,
@@ -620,12 +620,12 @@ $.Widget.prototype = {
 					curOption = curOption[ parts[ i ] ];
 				}
 				key = parts.pop();
-				if ( value === undefined ) {
+				if ( arguments.length === 1 ) {
 					return curOption[ key ] === undefined ? null : curOption[ key ];
 				}
 				curOption[ key ] = value;
 			} else {
-				if ( value === undefined ) {
+				if ( arguments.length === 1 ) {
 					return this.options[ key ] === undefined ? null : this.options[ key ];
 				}
 				options[ key ] = value;
@@ -832,7 +832,7 @@ $( document ).mouseup( function() {
 });
 
 $.widget("ui.mouse", {
-	version: "1.10.3",
+	version: "1.10.4",
 	options: {
 		cancel: "input,textarea,button,select,option",
 		distance: 1,
@@ -982,7 +982,267 @@ $.widget("ui.mouse", {
 })(jQuery);
 (function( $, undefined ) {
 
-/*jshint loopfunc: true */
+$.widget("ui.selectable", $.ui.mouse, {
+	version: "1.10.4",
+	options: {
+		appendTo: "body",
+		autoRefresh: true,
+		distance: 0,
+		filter: "*",
+		tolerance: "touch",
+
+		// callbacks
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
+	},
+	_create: function() {
+		var selectees,
+			that = this;
+
+		this.element.addClass("ui-selectable");
+
+		this.dragged = false;
+
+		// cache selectee children based on filter
+		this.refresh = function() {
+			selectees = $(that.options.filter, that.element[0]);
+			selectees.addClass("ui-selectee");
+			selectees.each(function() {
+				var $this = $(this),
+					pos = $this.offset();
+				$.data(this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass("ui-selected"),
+					selecting: $this.hasClass("ui-selecting"),
+					unselecting: $this.hasClass("ui-unselecting")
+				});
+			});
+		};
+		this.refresh();
+
+		this.selectees = selectees.addClass("ui-selectee");
+
+		this._mouseInit();
+
+		this.helper = $("<div class='ui-selectable-helper'></div>");
+	},
+
+	_destroy: function() {
+		this.selectees
+			.removeClass("ui-selectee")
+			.removeData("selectable-item");
+		this.element
+			.removeClass("ui-selectable ui-selectable-disabled");
+		this._mouseDestroy();
+	},
+
+	_mouseStart: function(event) {
+		var that = this,
+			options = this.options;
+
+		this.opos = [event.pageX, event.pageY];
+
+		if (this.options.disabled) {
+			return;
+		}
+
+		this.selectees = $(options.filter, this.element[0]);
+
+		this._trigger("start", event);
+
+		$(options.appendTo).append(this.helper);
+		// position helper (lasso)
+		this.helper.css({
+			"left": event.pageX,
+			"top": event.pageY,
+			"width": 0,
+			"height": 0
+		});
+
+		if (options.autoRefresh) {
+			this.refresh();
+		}
+
+		this.selectees.filter(".ui-selected").each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.startselected = true;
+			if (!event.metaKey && !event.ctrlKey) {
+				selectee.$element.removeClass("ui-selected");
+				selectee.selected = false;
+				selectee.$element.addClass("ui-unselecting");
+				selectee.unselecting = true;
+				// selectable UNSELECTING callback
+				that._trigger("unselecting", event, {
+					unselecting: selectee.element
+				});
+			}
+		});
+
+		$(event.target).parents().addBack().each(function() {
+			var doSelect,
+				selectee = $.data(this, "selectable-item");
+			if (selectee) {
+				doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
+				selectee.$element
+					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+				// selectable (UN)SELECTING callback
+				if (doSelect) {
+					that._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				} else {
+					that._trigger("unselecting", event, {
+						unselecting: selectee.element
+					});
+				}
+				return false;
+			}
+		});
+
+	},
+
+	_mouseDrag: function(event) {
+
+		this.dragged = true;
+
+		if (this.options.disabled) {
+			return;
+		}
+
+		var tmp,
+			that = this,
+			options = this.options,
+			x1 = this.opos[0],
+			y1 = this.opos[1],
+			x2 = event.pageX,
+			y2 = event.pageY;
+
+		if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
+		if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
+
+		this.selectees.each(function() {
+			var selectee = $.data(this, "selectable-item"),
+				hit = false;
+
+			//prevent helper from being selected if appendTo: selectable
+			if (!selectee || selectee.element === that.element[0]) {
+				return;
+			}
+
+			if (options.tolerance === "touch") {
+				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
+			} else if (options.tolerance === "fit") {
+				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			}
+
+			if (hit) {
+				// SELECT
+				if (selectee.selected) {
+					selectee.$element.removeClass("ui-selected");
+					selectee.selected = false;
+				}
+				if (selectee.unselecting) {
+					selectee.$element.removeClass("ui-unselecting");
+					selectee.unselecting = false;
+				}
+				if (!selectee.selecting) {
+					selectee.$element.addClass("ui-selecting");
+					selectee.selecting = true;
+					// selectable SELECTING callback
+					that._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				}
+			} else {
+				// UNSELECT
+				if (selectee.selecting) {
+					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
+						selectee.$element.removeClass("ui-selecting");
+						selectee.selecting = false;
+						selectee.$element.addClass("ui-selected");
+						selectee.selected = true;
+					} else {
+						selectee.$element.removeClass("ui-selecting");
+						selectee.selecting = false;
+						if (selectee.startselected) {
+							selectee.$element.addClass("ui-unselecting");
+							selectee.unselecting = true;
+						}
+						// selectable UNSELECTING callback
+						that._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+				if (selectee.selected) {
+					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
+						selectee.$element.removeClass("ui-selected");
+						selectee.selected = false;
+
+						selectee.$element.addClass("ui-unselecting");
+						selectee.unselecting = true;
+						// selectable UNSELECTING callback
+						that._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+			}
+		});
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+		var that = this;
+
+		this.dragged = false;
+
+		$(".ui-unselecting", this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass("ui-unselecting");
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			that._trigger("unselected", event, {
+				unselected: selectee.element
+			});
+		});
+		$(".ui-selecting", this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass("ui-selecting").addClass("ui-selected");
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			that._trigger("selected", event, {
+				selected: selectee.element
+			});
+		});
+		this._trigger("stop", event);
+
+		this.helper.remove();
+
+		return false;
+	}
+
+});
+
+})(jQuery);
+(function( $, undefined ) {
 
 function isOverAxis( x, reference, size ) {
 	return ( x > reference ) && ( x < ( reference + size ) );
@@ -993,7 +1253,7 @@ function isFloating(item) {
 }
 
 $.widget("ui.sortable", $.ui.mouse, {
-	version: "1.10.3",
+	version: "1.10.4",
 	widgetEventPrefix: "sort",
 	ready: false,
 	options: {
@@ -1334,12 +1594,12 @@ $.widget("ui.sortable", $.ui.mouse, {
 			}
 
 			// Only put the placeholder inside the current Container, skip all
-			// items form other containers. This works because when moving
+			// items from other containers. This works because when moving
 			// an item from one container to another the
 			// currentContainer is switched before the placeholder is moved.
 			//
-			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
-			// beetween the outer and inner container.
+			// Without this, moving items in "sub-sortables" can cause
+			// the placeholder to jitter beetween the outer and inner container.
 			if (item.instance !== this.currentContainer) {
 				continue;
 			}
@@ -1607,10 +1867,11 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
 
+		function addItems() {
+			items.push( this );
+		}
 		for (i = queries.length - 1; i >= 0; i--){
-			queries[i][0].each(function() {
-				items.push(this);
-			});
+			queries[i][0].each( addItems );
 		}
 
 		return $(items);
@@ -2168,12 +2429,17 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 
 		//Post events to containers
+		function delayEvent( type, instance, container ) {
+			return function( event ) {
+				container._trigger( type, event, instance._uiHash( instance ) );
+			};
+		}
 		for (i = this.containers.length - 1; i >= 0; i--){
-			if(!noPropagation) {
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			if (!noPropagation) {
+				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
 			}
 			if(this.containers[i].containerCache.over) {
-				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
 				this.containers[i].containerCache.over = 0;
 			}
 		}