Merge "[FileBackend] Changed copy script to use batches for concurrency."

[lhc/web/wiklou.git] / resources / jquery.ui / jquery.ui.selectable.js

diff --git a/resources/jquery.ui/jquery.ui.selectable.js b/resources/jquery.ui/jquery.ui.selectable.js
index bc707d3..403e62d 100644 (file)
--- a/resources/jquery.ui/jquery.ui.selectable.js
+++ b/resources/jquery.ui/jquery.ui.selectable.js
@@ -1,10 +1,9 @@
-
-/*
- * jQuery UI Selectable 1.8.2
+/*!
+ * jQuery UI Selectable 1.8.21
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Selectables
  *
@@ -13,7 +12,7 @@
  *     jquery.ui.mouse.js
  *     jquery.ui.widget.js
  */
-(function($) {
+(function( $, undefined ) {
 
 $.widget("ui.selectable", $.ui.mouse, {
        options: {
@@ -34,6 +33,7 @@ $.widget("ui.selectable", $.ui.mouse, {
                var selectees;
                this.refresh = function() {
                        selectees = $(self.options.filter, self.element[0]);
+                       selectees.addClass("ui-selectee");
                        selectees.each(function() {
                                var $this = $(this);
                                var pos = $this.offset();
@@ -90,8 +90,6 @@ $.widget("ui.selectable", $.ui.mouse, {
                $(options.appendTo).append(this.helper);
                // position helper (lasso)
                this.helper.css({
-                       "z-index": 100,
-                       "position": "absolute",
                        "left": event.clientX,
                        "top": event.clientY,
                        "width": 0,
@@ -105,7 +103,7 @@ $.widget("ui.selectable", $.ui.mouse, {
                this.selectees.filter('.ui-selected').each(function() {
                        var selectee = $.data(this, "selectable-item");
                        selectee.startselected = true;
-                       if (!event.metaKey) {
+                       if (!event.metaKey && !event.ctrlKey) {
                                selectee.$element.removeClass('ui-selected');
                                selectee.selected = false;
                                selectee.$element.addClass('ui-unselecting');
@@ -120,7 +118,7 @@ $.widget("ui.selectable", $.ui.mouse, {
                $(event.target).parents().andSelf().each(function() {
                        var selectee = $.data(this, "selectable-item");
                        if (selectee) {
-                               var doSelect = !event.metaKey || !selectee.$element.hasClass('ui-selected');
+                               var doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass('ui-selected');
                                selectee.$element
                                        .removeClass(doSelect ? "ui-unselecting" : "ui-selected")
                                        .addClass(doSelect ? "ui-selecting" : "ui-unselecting");
@@ -190,7 +188,7 @@ $.widget("ui.selectable", $.ui.mouse, {
                        } else {
                                // UNSELECT
                                if (selectee.selecting) {
-                                       if (event.metaKey && selectee.startselected) {
+                                       if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
                                                selectee.$element.removeClass('ui-selecting');
                                                selectee.selecting = false;
                                                selectee.$element.addClass('ui-selected');
@@ -209,7 +207,7 @@ $.widget("ui.selectable", $.ui.mouse, {
                                        }
                                }
                                if (selectee.selected) {
-                                       if (!event.metaKey && !selectee.startselected) {
+                                       if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
                                                selectee.$element.removeClass('ui-selected');
                                                selectee.selected = false;
 
@@ -263,7 +261,7 @@ $.widget("ui.selectable", $.ui.mouse, {
 });
 
 $.extend($.ui.selectable, {
-       version: "1.8.2"
+       version: "1.8.21"
 });
 
 })(jQuery);