tb_core 1.4.3.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff5711624143515d7f25cae3514af1952fe9bca
-  data.tar.gz: 6122374aada3014cb4b4cf8a9bd143eab357a15c
+  metadata.gz: 2510a27d312d495c3d4a1163f6aace27f801370e
+  data.tar.gz: ae0a3e6d44d4c30ea885097bf4219e0717564bd5
 SHA512:
-  metadata.gz: ae2b741afa3778b40a80e0e10c9b0bfdbd59dc84a09203aaff6a187908d2bbb2d1026c964de8e162b715123dca1be0c45fc216a6f4c923ff0e109d4d624d1136
-  data.tar.gz: d9519b8044a3f459b412c115700e223887b515952df7bac9bc68562e51f451a1c423bd5263b619facdced32a3b2b40d741d094a8c59e590b51c2537970a9267d
+  metadata.gz: b3a0574fd5d942b756698fb48f5772247335f8d89f2233c943d66089915b8f43520fffcbdcda3919804b316256d3270f1f79e50108da386e4f9e3a526d24f758
+  data.tar.gz: 453bada55663e0c324cb2c3f417933d3bf7635f5f075ec5b8a87c435820ddb712973d8f1e09286db956c955f9290a428483aa171aacedebe393662d60bd42287

data/README.md

@@ -41,7 +41,7 @@ Configuration
 
 The core engine provides various configuration options.
 
-    Spud::Core.configure do |config|
+    TbCore.configure do |config|
       config.option = value
       ...
     end
@@ -66,9 +66,9 @@ Running the example above would create an ActiveRecord model, migration, admin c
 
 Sometimes you want to create a dashboard app without all the magic described above. Start by building your controllers and views under the `admin` namespace. Extend your controller from `Admin::ApplicationController` in order to inherit the default admin behaviors, and look at the core admin controllers for example implementations.
 
-Then, add your module to the `Spud::Core.config.admin_applications` array. We recommend you perform this action in either an initializer or within your `application.rb` file.
+Then, add your module to the `TbCore.config.admin_applications` array. We recommend you perform this action in either an initializer or within your `application.rb` file.
 
-    Spud::Core.config.admin_applications += [{
+    TbCore.config.admin_applications += [{
       # Required:
       :name => "Clients",
       :thumbnail => "spud/admin/clients.png",
@@ -86,9 +86,10 @@ A common requirement is to add custom fields and functionality to the base `spud
 
 ### Adding custom methods and attributes to the SpudUser class
 
-Create a file in your app at `app/models/spud_user.rb`, and build a class called `SpudUser` that extends from `Spud::SpudUserModel`. You do not need any explicit requires - the autoloader will take care of the rest.
+Create a file in your app at `app/models/spud_user.rb`, and build a class called `SpudUser` that includes the `TbCore::UserModel` module.
 
-    class SpudUser < Spud::SpudUserModel
+    class SpudUser < ApplicationRecord
+      include TbCore::UserModel
       has_attached_file :avatar
       attr_accessible :avatar
       def say_hello
@@ -121,9 +122,9 @@ Create a file in your app at `app/views/admin/users/_show_additions.html.erb`.
 Error Handling
 ------------
 
-The base `TbCore::ApplicationController` will automatically rescue from any `Spud::NotFoundError` and `Spud::AccessDeniedError` errors by rendering out the `layouts/error_page.html` template. If you ran the `spud:setup` generator, a template of that name will have been created for you automatically.
+The base `TbCore::ApplicationController` will automatically rescue from any `TbCore::NotFoundError` and `TbCore::AccessDeniedError` errors by rendering out the `layouts/error_page.html` template. If you ran the `spud:setup` generator, a template of that name will have been created for you automatically.
 
-When building your own apps you may raise a `Spud::NotFoundError` or `Spud::AccessDeniedError` error at any time to halt further execution and cause the error page to render. For example:
+When building your own apps you may raise a `TbCore::NotFoundError` or `TbCore::AccessDeniedError` error at any time to halt further execution and cause the error page to render. For example:
 
     class CarsController
       before_action :get_record
@@ -175,87 +176,50 @@ A common case is to have a model in your app that `belongs_to :spud_user`. The `
       <%= f.tb_save_buttons('Widget', widgets_path) %>
     <% end %>
 
-Table Sorting
--------------
-
-We provide a few tools to assist with sorting tables of data backed by ActiveRecord queries. In your view, the `tb_table_header` helper method will generate a `<thead>` element with header tags.
-
-### Example
-
-```erb
-<%= tb_table_header :users_path do |t| %>
-  <%= t.sortable :full_name %>
-  <%= t.sortable :email %>
-  <%= t.sortable :birth_date %>
-  <%= t.header :favorite_color %> # Header without sorting
-  <th>Plain HTML is fine too</th>
-<% end %>
-```
-
-On the controller side, you can choose to deal with the `:dir` and `:sort` params using your own custom logic, or you can use the `SortableParams` module.
-
-```ruby
-include TbCore::SortableParams
-
-sortable_by :email,                               # A basic sort
-            full_name: [:last_name, :first_name], # This will sort on two columns
-            birth_date: 'birth_dates.date :dir',  # This will sort on a joined table
-            default: :email                       # The sort to use when none is passed
-
-def index
-  MyModel.where(...).order(sortable_query)
-end
-```
-
 Remote Forms
 --------------
 
-If you choose to include the `tb_core` JavaScript file in your project, we provide a couple additional features on top of the standard [jquery-ujs](https://github.com/rails/jquery-ujs) adapter. Use the following data attributes on your remote forms.
+Rails-validator is included for easy remote form validation.
 
-- `data-errors`: Set to `inline` for inline form errors, or `alert` for a browser alert window.
-- `data-success`: Set to a path you would like to redirect to. For example, redirecting back to an index after a successful post.
-
-This feature works with `tb_form_for` or standard `form_for` forms.
-
-### Example
+**Example**
 
-    <%= tb_form_for @widget, :remote => true, :data => {:errors => :inline, :success => widgets_path} do |f| %>
+    <%= tb_form_for @widget, remote: true, data: { errors: :inline, success: widgets_path } do |f| %>
       <!--input fields here -->
     <% end %>
 
-See `remote.js` for the full details.
+See [rails-validator](https://github.com/moser-inc/rails-validator) for details.
 
 Roles & Permissions
 -------------------
 
 A user can be assigned to a role, which itself has one or more permissions. These permissions serve two distinct purposes: Determining what dashboard apps a user has access to (if any), and being used within your application logic to establish fine-grained user abilities.
 
-Checking permissions is easy. Each permission has a `tag` which is a unique, namespaced identifier. Use the `has_permission?` and `has_any_permission?` methods on the user object to check for their existence. Keep in mind that these calls will always return true for users who have the `super_admin` flag set.
+Checking permissions is easy. Each permission has a `tag` which is a unique, namespaced identifier. Use the `permission?` and `any_permission?` methods on the user object to check for their existence. Keep in mind that these calls will always return true for users who have the `super_admin` flag set.
 
-    if !@spud_user.has_permission?('my_website.clients.my_clients')
+    if !@spud_user.permission?('my_website.clients.my_clients')
       redirect_to root_path, :notice => 'Permission Denied!'
     end
 
 Permissions are created one of two ways:
 
 1. Every dashboard app automatically generates a "Full Access" permission, with a tag of `admin.(app name).full_access`.
-2. You as the developer may append custom permissions to the `Spud::Core.permissions` array.
+2. You as the developer may append custom permissions to the `TbCore.permissions` array.
 
 Create custom permissions whenever you need to permit an action that falls outside of the standard "full access to an app" use case; For example, turning on/off the ability for a user to upload an avatar.
 
     // application.rb
-    Spud::Core.permissions += [
+    TbCore.permissions += [
       {:tag => 'my_website.profile.avatar', :name => 'Upload an avatar to my profile'}
     ]
     // some_view.html.erb
-    <% if current_user.has_permission?('my_website.profile.avatar') %>
+    <% if current_user.permission?('my_website.profile.avatar') %>
       <%= link_to 'Upload Avatar', upload_avatar_path %>
     <% end %>
 
 Finally, custom permissions may optionally be tied to one or more dashboard apps. A user who has the permission shown below would have access to the the Clients and Projects dashboard apps. After that is is up to you to code your view and controller logic in accorance to what permissions the user has.
 
     // application.rb
-    Spud::Core.permissions += [{
+    TbCore.permissions += [{
       :tag => 'my_website.projects.project_management',
       :name => 'Manage clients and projects, but cannot delete them or view private info',
       :apps => [:clients, :projects]

data/app/assets/javascripts/admin/core/application.js

@@ -1,14 +1,18 @@
+//= require rails-ujs
+//= require rails-validator
 //= require jquery
 //= require bootstrap-sprockets
-//= require ../../tb_core
 //= require_self
 //= require_tree .
 
-spud = {admin:{}};
+window.tb = {};
 
-$(document).ready(function() {
+// for legacy code
+window.spud = { admin: window.tb };
 
-  spud.admin.editor.init();
+document.addEventListener('DOMContentLoaded', function() {
+
+  tb.editor.init();
 
   $("#modal_window .modal-footer .form-submit").bind('click', function() {
     $("#modal_window .modal-body form").submit();

data/app/assets/javascripts/admin/core/dashboard.js

@@ -4,7 +4,7 @@
 
 var badgeInterval;
 
-spud.admin.dashboard = {
+tb.dashboard = {
   init:function(){
     badgeInterval = setInterval(updateBadges, 30000);
     updateBadges();
@@ -13,9 +13,8 @@ spud.admin.dashboard = {
 };
 
 var updateBadges = function() {
-  var url = tb.util.urlFor('admin/badges');
   $.ajax({
-    url: url
+    url: '/admin/badges'
   }).always(function(json) {
     if(json && json.data) {
       if(json.data.length === 0){

data/app/assets/javascripts/admin/core/date_picker.js

@@ -1,7 +1,7 @@
-spud.admin.date_picker = {};
+tb.date_picker = {};
 
 (function() {
-  var picker = spud.admin.date_picker;
+  var picker = tb.date_picker;
 
   parsePickerDate = function(value) {
     var date = new Date();

data/app/assets/javascripts/admin/core/editor.js

@@ -1,8 +1,8 @@
-spud.admin.editor = {};
+tb.editor = {};
 
 (function(){
 
-  var editor = spud.admin.editor;
+  var editor = tb.editor;
 
   editor.tinymce = {loaded:false};
 

data/app/assets/javascripts/admin/core/modal.js

@@ -1,6 +1,6 @@
 (function(){
 
-spud.admin.modal = {
+tb.modal = {
 
   displayWithOptions: function(options){
     var modal = $('#modal_window');

data/app/assets/javascripts/admin/core/users.js

@@ -2,7 +2,7 @@
 
 var $picker;
 
-spud.admin.users = {
+tb.users = {
   init: function(){
     var $body = $('body');
     $body.on('click', '.btn-generate-password', clickedGeneratePassword);
@@ -78,7 +78,7 @@ var clickedPickerEdit = function(e){
     $.ajax(href, {
       dataType: 'html',
       success: function(html){
-        spud.admin.modal.displayWithOptions({
+        tb.modal.displayWithOptions({
           title: 'Edit User',
           html: html,
           hideFooter: true
@@ -96,7 +96,7 @@ var clickedPickerAdd = function(e){
   $.ajax($(this).attr('href'), {
     dataType: 'html',
     success: function(html){
-      spud.admin.modal.displayWithOptions({
+      tb.modal.displayWithOptions({
         title: 'New User',
         html: html,
         hideFooter: true
@@ -122,10 +122,10 @@ var savedModalUser = function(event){
     $picker.append($option);
   }
   $picker.val(json.id);
-  spud.admin.modal.hide();
+  tb.modal.hide();
   return false;
 };
 
-$(document).ready(spud.admin.users.init);
+document.addEventListener('DOMContentLoaded', tb.users.init);
 
 })();

data/app/assets/javascripts/tb_core.js

@@ -0,0 +1,8 @@
+//= require rails-ujs
+//= require rails-validator
+
+console.warn("You are including tb_core.js in your application; This file is deprecated and may be removed.\n\
+For similar functionality, replace tb_core in your asset pipeline with the following:\n\
+\n\
+//= require rails-ujs\n\
+//= require rails-validator")

data/app/assets/libs/sortable/sortable.js

@@ -20,7 +20,7 @@
 })(function sortableFactory() {
 	"use strict";
 
-	if (typeof window == "undefined" || !window.document) {
+	if (typeof window === "undefined" || !window.document) {
 		return function sortableError() {
 			throw new Error("Sortable.js requires a window with a document");
 		};
@@ -64,16 +64,18 @@
 		win = window,
 		document = win.document,
 		parseInt = win.parseInt,
+		setTimeout = win.setTimeout,
 
 		$ = win.jQuery || win.Zepto,
 		Polymer = win.Polymer,
 
 		captureMode = false,
+		passiveMode = false,
 
-		supportDraggable = !!('draggable' in document.createElement('div')),
+		supportDraggable = ('draggable' in document.createElement('div')),
 		supportCssPointerEvents = (function (el) {
 			// false when IE11
-			if (!!navigator.userAgent.match(/Trident.*rv[ :]?11\./)) {
+			if (!!navigator.userAgent.match(/(?:Trident.*rv[ :]?11\.|msie)/i)) {
 				return false;
 			}
 			el = document.createElement('x');
@@ -214,6 +216,20 @@
 		}
 	;
 
+	// Detect support a passive mode
+	try {
+		window.addEventListener('test', null, Object.defineProperty({}, 'passive', {
+			get: function () {
+				// `false`, because everything starts to work incorrectly and instead of d'n'd,
+				// begins the page has scrolled.
+				passiveMode = false;
+				captureMode = {
+					capture: false,
+					passive: passiveMode
+				};
+			}
+		}));
+	} catch (err) {}
 
 	/**
 	 * @class  Sortable
@@ -261,7 +277,8 @@
 			fallbackClass: 'sortable-fallback',
 			fallbackOnBody: false,
 			fallbackTolerance: 0,
-			fallbackOffset: {x: 0, y: 0}
+			fallbackOffset: {x: 0, y: 0},
+			supportPointer: Sortable.supportPointer !== false
 		};
 
 
@@ -285,7 +302,7 @@
 		// Bind events
 		_on(el, 'mousedown', this._onTapStart);
 		_on(el, 'touchstart', this._onTapStart);
-		_on(el, 'pointerdown', this._onTapStart);
+		options.supportPointer && _on(el, 'pointerdown', this._onTapStart);
 
 		if (this.nativeDraggable) {
 			_on(el, 'dragover', this);
@@ -310,7 +327,7 @@
 				type = evt.type,
 				touch = evt.touches && evt.touches[0],
 				target = (touch || evt).target,
-				originalTarget = evt.target.shadowRoot && evt.path[0] || target,
+				originalTarget = evt.target.shadowRoot && (evt.path && evt.path[0]) || target,
 				filter = options.filter,
 				startIndex;
 
@@ -322,10 +339,14 @@
 				return;
 			}
 
-			if (type === 'mousedown' && evt.button !== 0 || options.disabled) {
+			if (/mousedown|pointerdown/.test(type) && evt.button !== 0 || options.disabled) {
 				return; // only left button or enabled
 			}
 
+			// cancel dnd if original target is content editable
+			if (originalTarget.isContentEditable) {
+				return;
+			}
 
 			target = _closest(target, options.draggable, el);
 
@@ -344,7 +365,7 @@
 			// Check filter
 			if (typeof filter === 'function') {
 				if (filter.call(this, evt, target, this)) {
-					_dispatchEvent(_this, originalTarget, 'filter', target, el, startIndex);
+					_dispatchEvent(_this, originalTarget, 'filter', target, el, el, startIndex);
 					preventOnFilter && evt.preventDefault();
 					return; // cancel dnd
 				}
@@ -354,7 +375,7 @@
 					criteria = _closest(originalTarget, criteria.trim(), el);
 
 					if (criteria) {
-						_dispatchEvent(_this, criteria, 'filter', target, el, startIndex);
+						_dispatchEvent(_this, criteria, 'filter', target, el, el, startIndex);
 						return true;
 					}
 				});
@@ -394,7 +415,7 @@
 				this._lastX = (touch || evt).clientX;
 				this._lastY = (touch || evt).clientY;
 
-				dragEl.style['will-change'] = 'transform';
+				dragEl.style['will-change'] = 'all';
 
 				dragStartFn = function () {
 					// Delayed drag has been triggered
@@ -411,7 +432,7 @@
 					_this._triggerDragStart(evt, touch);
 
 					// Drag start event
-					_dispatchEvent(_this, rootEl, 'choose', dragEl, rootEl, oldIndex);
+					_dispatchEvent(_this, rootEl, 'choose', dragEl, rootEl, rootEl, oldIndex);
 				};
 
 				// Disable "draggable"
@@ -422,8 +443,8 @@
 				_on(ownerDocument, 'mouseup', _this._onDrop);
 				_on(ownerDocument, 'touchend', _this._onDrop);
 				_on(ownerDocument, 'touchcancel', _this._onDrop);
-				_on(ownerDocument, 'pointercancel', _this._onDrop);
 				_on(ownerDocument, 'selectstart', _this);
+				options.supportPointer && _on(ownerDocument, 'pointercancel', _this._onDrop);
 
 				if (options.delay) {
 					// If the user moves the pointer or let go the click or touch
@@ -434,7 +455,7 @@
 					_on(ownerDocument, 'touchcancel', _this._disableDelayedDrag);
 					_on(ownerDocument, 'mousemove', _this._disableDelayedDrag);
 					_on(ownerDocument, 'touchmove', _this._disableDelayedDrag);
-					_on(ownerDocument, 'pointermove', _this._disableDelayedDrag);
+					options.supportPointer && _on(ownerDocument, 'pointermove', _this._disableDelayedDrag);
 
 					_this._dragStartTimer = setTimeout(dragStartFn, options.delay);
 				} else {
@@ -481,7 +502,7 @@
 			try {
 				if (document.selection) {
 					// Timeout neccessary for IE9
-					setTimeout(function () {
+					_nextTick(function () {
 						document.selection.empty();
 					});
 				} else {
@@ -502,7 +523,7 @@
 				Sortable.active = this;
 
 				// Drag start event
-				_dispatchEvent(this, rootEl, 'start', dragEl, rootEl, oldIndex);
+				_dispatchEvent(this, rootEl, 'start', dragEl, rootEl, rootEl, oldIndex);
 			} else {
 				this._nulling();
 			}
@@ -521,9 +542,14 @@
 					_css(ghostEl, 'display', 'none');
 				}
 
-				var target = document.elementFromPoint(touchEvt.clientX, touchEvt.clientY),
-					parent = target,
-					i = touchDragOverListeners.length;
+				var target = document.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
+				var parent = target;
+				var i = touchDragOverListeners.length;
+
+				if (target && target.shadowRoot) {
+					target = target.shadowRoot.elementFromPoint(touchEvt.clientX, touchEvt.clientY);
+					parent = target;
+				}
 
 				if (parent) {
 					do {
@@ -621,22 +647,26 @@
 		},
 
 		_onDragStart: function (/**Event*/evt, /**boolean*/useFallback) {
-			var dataTransfer = evt.dataTransfer,
-				options = this.options;
+			var _this = this;
+			var dataTransfer = evt.dataTransfer;
+			var options = _this.options;
 
-			this._offUpEvents();
+			_this._offUpEvents();
 
-			if (activeGroup.checkPull(this, this, dragEl, evt)) {
+			if (activeGroup.checkPull(_this, _this, dragEl, evt)) {
 				cloneEl = _clone(dragEl);
 
 				cloneEl.draggable = false;
 				cloneEl.style['will-change'] = '';
 
 				_css(cloneEl, 'display', 'none');
-				_toggleClass(cloneEl, this.options.chosenClass, false);
+				_toggleClass(cloneEl, _this.options.chosenClass, false);
 
-				rootEl.insertBefore(cloneEl, dragEl);
-				_dispatchEvent(this, rootEl, 'clone', dragEl);
+				// #1143: IFrame support workaround
+				_this._cloneId = _nextTick(function () {
+					rootEl.insertBefore(cloneEl, dragEl);
+					_dispatchEvent(_this, rootEl, 'clone', dragEl);
+				});
 			}
 
 			_toggleClass(dragEl, options.dragClass, true);
@@ -644,27 +674,36 @@
 			if (useFallback) {
 				if (useFallback === 'touch') {
 					// Bind touch events
-					_on(document, 'touchmove', this._onTouchMove);
-					_on(document, 'touchend', this._onDrop);
-					_on(document, 'touchcancel', this._onDrop);
-					_on(document, 'pointermove', this._onTouchMove);
-					_on(document, 'pointerup', this._onDrop);
+					_on(document, 'touchmove', _this._onTouchMove);
+					_on(document, 'touchend', _this._onDrop);
+					_on(document, 'touchcancel', _this._onDrop);
+
+					if (options.supportPointer) {
+						_on(document, 'pointermove', _this._onTouchMove);
+						_on(document, 'pointerup', _this._onDrop);
+					}
 				} else {
 					// Old brwoser
-					_on(document, 'mousemove', this._onTouchMove);
-					_on(document, 'mouseup', this._onDrop);
+					_on(document, 'mousemove', _this._onTouchMove);
+					_on(document, 'mouseup', _this._onDrop);
 				}
 
-				this._loopId = setInterval(this._emulateDragOver, 50);
+				_this._loopId = setInterval(_this._emulateDragOver, 50);
 			}
 			else {
 				if (dataTransfer) {
 					dataTransfer.effectAllowed = 'move';
-					options.setData && options.setData.call(this, dataTransfer, dragEl);
+					options.setData && options.setData.call(_this, dataTransfer, dragEl);
 				}
 
-				_on(document, 'drop', this);
-				setTimeout(this._dragStarted, 0);
+				_on(document, 'drop', _this);
+
+				// #1143: Бывает элемент с IFrame внутри блокирует `drop`,
+				// поэтому если вызвался `mouseover`, значит надо отменять весь d'n'd.
+				// Breaking Chrome 62+
+				// _on(document, 'mouseover', _this);
+
+				_this._dragStartId = _nextTick(_this._dragStarted);
 			}
 		},
 
@@ -736,8 +775,13 @@
 
 
 				if ((el.children.length === 0) || (el.children[0] === ghostEl) ||
-					(el === evt.target) && (target = _ghostIsLast(el, evt))
+					(el === evt.target) && (_ghostIsLast(el, evt))
 				) {
+					//assign target only if condition is true
+					if (el.children.length !== 0 && el.children[0] !== ghostEl && el === evt.target) {
+						target = el.lastElementChild;
+					}
+
 					if (target) {
 						if (target.animated) {
 							return;
@@ -775,34 +819,36 @@
 						isLong = (target.offsetHeight > dragEl.offsetHeight),
 						halfway = (floating ? (evt.clientX - targetRect.left) / width : (evt.clientY - targetRect.top) / height) > 0.5,
 						nextSibling = target.nextElementSibling,
-						moveVector = _onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt),
 						after = false
 					;
 
-					if (moveVector !== false) {
-						_silent = true;
-						setTimeout(_unsilent, 30);
+					if (floating) {
+						var elTop = dragEl.offsetTop,
+							tgTop = target.offsetTop;
 
-						_cloneHide(activeSortable, isOwner);
+						if (elTop === tgTop) {
+							after = (target.previousElementSibling === dragEl) && !isWide || halfway && isWide;
+						}
+						else if (target.previousElementSibling === dragEl || dragEl.previousElementSibling === target) {
+							after = (evt.clientY - targetRect.top) / height > 0.5;
+						} else {
+							after = tgTop > elTop;
+						}
+						} else if (!isMovingBetweenSortable) {
+						after = (nextSibling !== dragEl) && !isLong || halfway && isLong;
+					}
+
+					var moveVector = _onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, after);
 
+					if (moveVector !== false) {
 						if (moveVector === 1 || moveVector === -1) {
 							after = (moveVector === 1);
 						}
-						else if (floating) {
-							var elTop = dragEl.offsetTop,
-								tgTop = target.offsetTop;
 
-							if (elTop === tgTop) {
-								after = (target.previousElementSibling === dragEl) && !isWide || halfway && isWide;
-							}
-							else if (target.previousElementSibling === dragEl || dragEl.previousElementSibling === target) {
-								after = (evt.clientY - targetRect.top) / height > 0.5;
-							} else {
-								after = tgTop > elTop;
-							}
-						} else if (!isMovingBetweenSortable) {
-							after = (nextSibling !== dragEl) && !isLong || halfway && isLong;
-						}
+						_silent = true;
+						setTimeout(_unsilent, 30);
+
+						_cloneHide(activeSortable, isOwner);
 
 						if (!dragEl.contains(el)) {
 							if (after && !nextSibling) {
@@ -860,6 +906,7 @@
 			_off(ownerDocument, 'touchend', this._onDrop);
 			_off(ownerDocument, 'pointerup', this._onDrop);
 			_off(ownerDocument, 'touchcancel', this._onDrop);
+			_off(ownerDocument, 'pointercancel', this._onDrop);
 			_off(ownerDocument, 'selectstart', this);
 		},
 
@@ -871,7 +918,11 @@
 			clearInterval(autoScroll.pid);
 			clearTimeout(this._dragStartTimer);
 
+			_cancelNextTick(this._cloneId);
+			_cancelNextTick(this._dragStartId);
+
 			// Unbind events
+			_off(document, 'mouseover', this);
 			_off(document, 'mousemove', this._onTouchMove);
 
 			if (this.nativeDraggable) {
@@ -887,11 +938,11 @@
 					!options.dropBubble && evt.stopPropagation();
 				}
 
-				ghostEl && ghostEl.parentNode.removeChild(ghostEl);
+				ghostEl && ghostEl.parentNode && ghostEl.parentNode.removeChild(ghostEl);
 
 				if (rootEl === parentEl || Sortable.active.lastPullMode !== 'clone') {
 					// Remove clone
-					cloneEl && cloneEl.parentNode.removeChild(cloneEl);
+					cloneEl && cloneEl.parentNode && cloneEl.parentNode.removeChild(cloneEl);
 				}
 
 				if (dragEl) {
@@ -906,19 +957,22 @@
 					_toggleClass(dragEl, this.options.ghostClass, false);
 					_toggleClass(dragEl, this.options.chosenClass, false);
 
+					// Drag stop event
+					_dispatchEvent(this, rootEl, 'unchoose', dragEl, parentEl, rootEl, oldIndex);
+
 					if (rootEl !== parentEl) {
 						newIndex = _index(dragEl, options.draggable);
 
 						if (newIndex >= 0) {
 							// Add event
-							_dispatchEvent(null, parentEl, 'add', dragEl, rootEl, oldIndex, newIndex);
+							_dispatchEvent(null, parentEl, 'add', dragEl, parentEl, rootEl, oldIndex, newIndex);
 
 							// Remove event
-							_dispatchEvent(this, rootEl, 'remove', dragEl, rootEl, oldIndex, newIndex);
+							_dispatchEvent(this, rootEl, 'remove', dragEl, parentEl, rootEl, oldIndex, newIndex);
 
 							// drag from one list and drop into another
-							_dispatchEvent(null, parentEl, 'sort', dragEl, rootEl, oldIndex, newIndex);
-							_dispatchEvent(this, rootEl, 'sort', dragEl, rootEl, oldIndex, newIndex);
+							_dispatchEvent(null, parentEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex);
+							_dispatchEvent(this, rootEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex);
 						}
 					}
 					else {
@@ -928,8 +982,8 @@
 
 							if (newIndex >= 0) {
 								// drag & drop within the same list
-								_dispatchEvent(this, rootEl, 'update', dragEl, rootEl, oldIndex, newIndex);
-								_dispatchEvent(this, rootEl, 'sort', dragEl, rootEl, oldIndex, newIndex);
+								_dispatchEvent(this, rootEl, 'update', dragEl, parentEl, rootEl, oldIndex, newIndex);
+								_dispatchEvent(this, rootEl, 'sort', dragEl, parentEl, rootEl, oldIndex, newIndex);
 							}
 						}
 					}
@@ -940,7 +994,7 @@
 							newIndex = oldIndex;
 						}
 
-						_dispatchEvent(this, rootEl, 'end', dragEl, rootEl, oldIndex, newIndex);
+						_dispatchEvent(this, rootEl, 'end', dragEl, parentEl, rootEl, oldIndex, newIndex);
 
 						// Save sorting
 						this.save();
@@ -998,6 +1052,10 @@
 					}
 					break;
 
+				case 'mouseover':
+					this._onDrop(evt);
+					break;
+
 				case 'selectstart':
 					evt.preventDefault();
 					break;
@@ -1245,7 +1303,7 @@
 
 
 
-	function _dispatchEvent(sortable, rootEl, name, targetEl, fromEl, startIndex, newIndex) {
+	function _dispatchEvent(sortable, rootEl, name, targetEl, toEl, fromEl, startIndex, newIndex) {
 		sortable = (sortable || rootEl[expando]);
 
 		var evt = document.createEvent('Event'),
@@ -1254,7 +1312,7 @@
 
 		evt.initEvent(name, true, true);
 
-		evt.to = rootEl;
+		evt.to = toEl || rootEl;
 		evt.from = fromEl || rootEl;
 		evt.item = targetEl || rootEl;
 		evt.clone = cloneEl;
@@ -1270,7 +1328,7 @@
 	}
 
 
-	function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalEvt) {
+	function _onMove(fromEl, toEl, dragEl, dragRect, targetEl, targetRect, originalEvt, willInsertAfter) {
 		var evt,
 			sortable = fromEl[expando],
 			onMoveFn = sortable.options.onMove,
@@ -1285,6 +1343,7 @@
 		evt.draggedRect = dragRect;
 		evt.related = targetEl || toEl;
 		evt.relatedRect = targetRect || toEl.getBoundingClientRect();
+		evt.willInsertAfter = willInsertAfter;
 
 		fromEl.dispatchEvent(evt);
 
@@ -1313,10 +1372,8 @@
 
 		// 5 — min delta
 		// abs — нельзя добавлять, а то глюки при наведении сверху
-		return (
-			(evt.clientY - (rect.top + rect.height) > 5) ||
-			(evt.clientX - (rect.right + rect.width) > 5)
-		) && lastEl;
+		return (evt.clientY - (rect.top + rect.height) > 5) ||
+			(evt.clientX - (rect.left + rect.width) > 5);
 	}
 
 
@@ -1411,15 +1468,20 @@
 	}
 
 	function _clone(el) {
-		return $
-			? $(el).clone(true)[0]
-			: (Polymer && Polymer.dom
-				? Polymer.dom(el).cloneNode(true)
-				: el.cloneNode(true)
-			);
+		if (Polymer && Polymer.dom) {
+			return Polymer.dom(el).cloneNode(true);
+		}
+		else if ($) {
+			return $(el).clone(true)[0];
+		}
+		else {
+			return el.cloneNode(true);
+		}
 	}
 
 	function _saveInputCheckedState(root) {
+		savedInputChecked.length = 0;
+
 		var inputs = root.getElementsByTagName('input');
 		var idx = inputs.length;
 
@@ -1429,6 +1491,14 @@
 		}
 	}
 
+	function _nextTick(fn) {
+		return setTimeout(fn, 0);
+	}
+
+	function _cancelNextTick(id) {
+		return clearTimeout(id);
+	}
+
 	// Fixed #973:
 	_on(document, 'touchmove', function (evt) {
 		if (Sortable.active) {
@@ -1436,17 +1506,6 @@
 		}
 	});
 
-	try {
-		window.addEventListener('test', null, Object.defineProperty({}, 'passive', {
-			get: function () {
-				captureMode = {
-					capture: false,
-					passive: false
-				};
-			}
-		}));
-	} catch (err) {}
-
 	// Export utils
 	Sortable.utils = {
 		on: _on,
@@ -1461,7 +1520,9 @@
 		closest: _closest,
 		toggleClass: _toggleClass,
 		clone: _clone,
-		index: _index
+		index: _index,
+		nextTick: _nextTick,
+		cancelNextTick: _cancelNextTick
 	};
 
 
@@ -1476,6 +1537,6 @@
 
 
 	// Export
-	Sortable.version = '1.5.1';
+	Sortable.version = '1.7.0';
 	return Sortable;
 });