Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-29 23:57:41 +02:00
Code Issues Projects Releases Wiki Activity

Don't unpublish posts when a user edit who can edit publised posts but not publih new posts edits a post. Props jeremyclarke. see #7070 for trunk

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@8032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-06-02 21:01:42 +00:00
parent 282cb020ea
commit 4bb7f1c0c4
5 changed files with 1417 additions and 1370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/edit-form-advanced.php
View File

@ -91,7 +91,10 @@ else
<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p> <p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
<p> <p>
<select name='post_status' id='post_status' tabindex='4'> <select name='post_status' id='post_status' tabindex='4'>
<?php if ( current_user_can('publish_posts') ) : // Contributors only get "Unpublished" and "Pending Review" ?> <?php
// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability)
if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) :
?>
<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option> <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
<?php if ( 'future' == $post->post_status ) : ?> <?php if ( 'future' == $post->post_status ) : ?>
<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option> <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option>

9
wp-admin/includes/post.php
View File

@ -57,12 +57,19 @@ function _wp_translate_postdata( $update = false ) {
if ( isset($_POST['advanced']) && '' != $_POST['advanced'] ) if ( isset($_POST['advanced']) && '' != $_POST['advanced'] )
$_POST['post_status'] = 'draft'; $_POST['post_status'] = 'draft';
$previous_status = get_post_field('post_status', $_POST['ID']);
// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
if ( 'page' == $_POST['post_type'] ) { if ( 'page' == $_POST['post_type'] ) {
if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) ) if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_pages' ) )
$_POST['post_status'] = 'pending'; $_POST['post_status'] = 'pending';
} else { } else {
if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) ) if ( 'publish' == $_POST['post_status'] && !current_user_can( 'publish_posts' ) ) :
// Stop attempts to publish new posts, but allow already published posts to be saved if appropriate.
if ( $previous_status != 'publish' OR !current_user_can( 'edit_published_posts') )
$_POST['post_status'] = 'pending'; $_POST['post_status'] = 'pending';
endif;
} }
if (!isset( $_POST['comment_status'] )) if (!isset( $_POST['comment_status'] ))

226
wp-includes/js/jquery/ui.core.js
View File

@ -7,11 +7,11 @@
* *
* http://docs.jquery.com/UI * http://docs.jquery.com/UI
* *
* $Id: ui.core.js 5634 2008-05-19 20:53:51Z joern.zaefferer $ * $Id: ui.core.js 5587 2008-05-13 19:56:42Z scott.gonzalez $
*/ */
;(function($) { ;(function($) {
$.ui = { $.ui = {
plugin: { plugin: {
add: function(module, option, set) { add: function(module, option, set) {
var proto = $.ui[module].prototype; var proto = $.ui[module].prototype;
@ -64,27 +64,27 @@
has = e[scroll] > 0 ? true : false; e[scroll] = 0; has = e[scroll] > 0 ? true : false; e[scroll] = 0;
return has; return has;
} }
}; };
/** jQuery core modifications and additions **/ /** jQuery core modifications and additions **/
var _remove = $.fn.remove; var _remove = $.fn.remove;
$.fn.remove = function() { $.fn.remove = function() {
$("*", this).add(this).trigger("remove"); $("*", this).add(this).trigger("remove");
return _remove.apply(this, arguments ); return _remove.apply(this, arguments );
}; };
// $.widget is a factory to create jQuery plugins // $.widget is a factory to create jQuery plugins
// taking some boilerplate code out of the plugin code // taking some boilerplate code out of the plugin code
// created by Scott González and Jörn Zaefferer // created by Scott González and Jörn Zaefferer
function getter(namespace, plugin, method) { function getter(namespace, plugin, method) {
var methods = $[namespace][plugin].getter || []; var methods = $[namespace][plugin].getter || [];
methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods); methods = (typeof methods == "string" ? methods.split(/,?\s+/) : methods);
return ($.inArray(method, methods) != -1); return ($.inArray(method, methods) != -1);
} }
var widgetPrototype = { var widgetPrototype = {
init: function() {}, init: function() {},
destroy: function() { destroy: function() {
this.element.removeData(this.widgetName); this.element.removeData(this.widgetName);
@ -103,9 +103,9 @@
disable: function() { disable: function() {
this.setData('disabled', true); this.setData('disabled', true);
} }
}; };
$.widget = function(name, prototype) { $.widget = function(name, prototype) {
var namespace = name.split(".")[0]; var namespace = name.split(".")[0];
name = name.split(".")[1]; name = name.split(".")[1];
// create plugin method // create plugin method
@ -151,91 +151,127 @@
// add widget prototype // add widget prototype
$[namespace][name].prototype = $.extend({}, widgetPrototype, prototype); $[namespace][name].prototype = $.extend({}, widgetPrototype, prototype);
}; };
/** Mouse Interaction Plugin **/ /** Mouse Interaction Plugin **/
$.widget("ui.mouse", { $.ui.mouse = {
init: function() { mouseInit: function() {
var self = this; var self = this;
this.element this.element.bind('mousedown.'+this.widgetName, function(e) {
.bind('mousedown.mouse', function() { return self.click.apply(self, arguments); }) return self.mouseDown(e);
.bind('mouseup.mouse', function() { (self.timer && clearTimeout(self.timer)); })
.bind('click.mouse', function() { if(self.initialized) { self.initialized = false; return false; } });
//Prevent text selection in IE
if ($.browser.msie) {
this.unselectable = this.element.attr('unselectable');
this.element.attr('unselectable', 'on');
}
},
destroy: function() {
this.element.unbind('.mouse').removeData("mouse");
($.browser.msie && this.element.attr('unselectable', this.unselectable));
},
trigger: function() { return this.click.apply(this, arguments); },
click: function(e) {
if( e.which != 1 //only left click starts dragging
|| $.inArray(e.target.nodeName.toLowerCase(), this.options.dragPrevention || []) != -1 // Prevent execution on defined elements
|| (this.options.condition && !this.options.condition.apply(this.options.executor || this, [e, this.element])) //Prevent execution on condition
) { return true; }
var self = this;
this.initialized = false;
var initialize = function() {
self._MP = { left: e.pageX, top: e.pageY }; // Store the click mouse position
$(document).bind('mouseup.mouse', function() { return self.stop.apply(self, arguments); });
$(document).bind('mousemove.mouse', function() { return self.drag.apply(self, arguments); });
if(!self.initalized && Math.abs(self._MP.left-e.pageX) >= self.options.distance || Math.abs(self._MP.top-e.pageY) >= self.options.distance) {
(self.options.start && self.options.start.call(self.options.executor || self, e, self.element));
(self.options.drag && self.options.drag.call(self.options.executor || self, e, this.element)); //This is actually not correct, but expected
self.initialized = true;
}
};
if(this.options.delay) {
if(this.timer) { clearTimeout(this.timer); }
this.timer = setTimeout(initialize, this.options.delay);
} else {
initialize();
}
return false;
},
stop: function(e) {
if(!this.initialized) {
return $(document).unbind('mouseup.mouse').unbind('mousemove.mouse');
}
(this.options.stop && this.options.stop.call(this.options.executor || this, e, this.element));
$(document).unbind('mouseup.mouse').unbind('mousemove.mouse');
return false;
},
drag: function(e) {
var o = this.options;
if ($.browser.msie && !e.button) {
return this.stop.call(this, e); // IE mouseup check
}
if(!this.initialized && (Math.abs(this._MP.left-e.pageX) >= o.distance || Math.abs(this._MP.top-e.pageY) >= o.distance)) {
(o.start && o.start.call(o.executor || this, e, this.element));
this.initialized = true;
} else {
if(!this.initialized) { return false; }
}
(o.drag && o.drag.call(this.options.executor || this, e, this.element));
return false;
}
}); });
// Prevent text selection in IE
if ($.browser.msie) {
this._mouseUnselectable = this.element.attr('unselectable');
this.element.attr('unselectable', 'on');
}
this.started = false;
},
// TODO: make sure destroying one instance of mouse doesn't mess with
// other instances of mouse
mouseDestroy: function() {
this.element.unbind('.'+this.widgetName);
// Restore text selection in IE
($.browser.msie
&& this.element.attr('unselectable', this._mouseUnselectable));
},
mouseDown: function(e) {
// we may have missed mouseup (out of window)
(this._mouseStarted && this.mouseUp(e));
this._mouseDownEvent = e;
var self = this,
btnIsLeft = (e.which == 1),
elIsCancel = ($(e.target).is(this.options.cancel));
if (!btnIsLeft || elIsCancel) {
return true;
}
this._mouseDelayMet = !this.options.delay;
if (!this._mouseDelayMet) {
this._mouseDelayTimer = setTimeout(function() {
self._mouseDelayMet = true;
}, this.options.delay);
}
// these delegates are required to keep context
this._mouseMoveDelegate = function(e) {
return self.mouseMove(e);
};
this._mouseUpDelegate = function(e) {
return self.mouseUp(e);
};
$(document)
.bind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
.bind('mouseup.'+this.widgetName, this._mouseUpDelegate);
return false;
},
mouseMove: function(e) {
// IE mouseup check - mouseup happened when mouse was out of window
if ($.browser.msie && !e.button) {
return this.mouseUp(e);
}
if (this._mouseStarted) {
this.mouseDrag(e);
return false;
}
if (this.mouseDistanceMet(e) && this.mouseDelayMet(e)) {
this._mouseStarted =
(this.mouseStart(this._mouseDownEvent, e) !== false);
(this._mouseStarted || this.mouseUp(e));
}
return !this._mouseStarted;
},
mouseUp: function(e) {
$(document)
.unbind('mousemove.'+this.widgetName, this._mouseMoveDelegate)
.unbind('mouseup.'+this.widgetName, this._mouseUpDelegate);
if (this._mouseStarted) {
this._mouseStarted = false;
this.mouseStop(e);
}
return false;
},
mouseDistanceMet: function(e) {
return (Math.max(
Math.abs(this._mouseDownEvent.pageX - e.pageX),
Math.abs(this._mouseDownEvent.pageY - e.pageY)
) >= this.options.distance
);
},
mouseDelayMet: function(e) {
return this._mouseDelayMet;
},
// These are placeholder methods, to be overriden by extending plugin
mouseStart: function(e) {},
mouseDrag: function(e) {},
mouseStop: function(e) {}
};
$.ui.mouse.defaults = {
cancel: null,
distance: 0,
delay: 0
};
})(jQuery); })(jQuery);

593
wp-includes/js/jquery/ui.sortable.js
View File

@ -14,7 +14,7 @@
*/ */
;(function($) { ;(function($) {
function contains(a, b) { function contains(a, b) {
var safari2 = $.browser.safari && $.browser.version < 522; var safari2 = $.browser.safari && $.browser.version < 522;
if (a.contains && !safari2) { if (a.contains && !safari2) {
return a.contains(b); return a.contains(b);
@ -24,9 +24,9 @@
while (b = b.parentNode) while (b = b.parentNode)
if (b == a) return true; if (b == a) return true;
return false; return false;
}; };
$.widget("ui.sortable", { $.widget("ui.sortable", $.extend($.ui.mouse, {
init: function() { init: function() {
var o = this.options; var o = this.options;
@ -44,39 +44,7 @@
this.offset = this.element.offset(); this.offset = this.element.offset();
//Initialize mouse events for interaction //Initialize mouse events for interaction
this.element.mouse({ this.mouseInit();
executor: this,
delay: o.delay,
distance: o.distance || 1,
dragPrevention: o.prevention ? o.prevention.toLowerCase().split(',') : ['input','textarea','button','select','option'],
start: this.start,
stop: this.stop,
drag: this.drag,
condition: function(e) {
if(this.options.disabled || this.options.type == 'static') return false;
//Find out if the clicked node (or one of its parents) is a actual item in this.items
var currentItem = null, nodes = $(e.target).parents().each(function() {
if($.data(this, 'sortable-item')) {
currentItem = $(this);
return false;
}
});
if($.data(e.target, 'sortable-item')) currentItem = $(e.target);
if(!currentItem) return false;
if(this.options.handle) {
var validHandle = false;
$(this.options.handle, currentItem).each(function() { if(this == e.target) validHandle = true; });
if(!validHandle) return false;
}
this.currentItem = currentItem;
return true;
}
});
}, },
plugins: {}, plugins: {},
@ -84,22 +52,23 @@
return { return {
helper: (inst || this)["helper"], helper: (inst || this)["helper"],
placeholder: (inst || this)["placeholder"] || $([]), placeholder: (inst || this)["placeholder"] || $([]),
position: (inst || this)["position"].current, position: (inst || this)["position"],
absolutePosition: (inst || this)["position"].absolute, absolutePosition: (inst || this)["positionAbs"],
instance: this,
options: this.options, options: this.options,
element: this.element, element: this.element,
item: (inst || this)["currentItem"], item: (inst || this)["currentItem"],
sender: inst ? inst.element : null sender: inst ? inst.element : null
}; };
}, },
propagate: function(n,e,inst) { propagate: function(n,e,inst, noPropagation) {
$.ui.plugin.call(this, n, [e, this.ui(inst)]); $.ui.plugin.call(this, n, [e, this.ui(inst)]);
this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]); if(!noPropagation) this.element.triggerHandler(n == "sort" ? n : "sort"+n, [e, this.ui(inst)], this.options[n]);
}, },
serialize: function(o) { serialize: function(o) {
var items = $(this.options.items, this.element).not('.ui-sortable-helper'); //Only the items of the sortable itself
var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
var str = []; o = o || {}; var str = []; o = o || {};
items.each(function() { items.each(function() {
@ -111,7 +80,7 @@
}, },
toArray: function(attr) { toArray: function(attr) {
var items = $(this.options.items, this.element).not('.ui-sortable-helper'); //Only the items of the sortable itself var items = ($.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)).not('.ui-sortable-helper'); //Only the items of the sortable itself
var ret = []; var ret = [];
items.each(function() { ret.push($(this).attr(attr || 'id')); }); items.each(function() { ret.push($(this).attr(attr || 'id')); });
@ -128,13 +97,13 @@
/* Be careful with the following core functions */ /* Be careful with the following core functions */
intersectsWith: function(item) { intersectsWith: function(item) {
var x1 = this.position.absolute.left, x2 = x1 + this.helperProportions.width, var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
y1 = this.position.absolute.top, y2 = y1 + this.helperProportions.height; y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
var l = item.left, r = l + item.width, var l = item.left, r = l + item.width,
t = item.top, b = t + item.height; t = item.top, b = t + item.height;
if(this.options.tolerance == "pointer") { if(this.options.tolerance == "pointer") {
return (y1 + this.clickOffset.top > t && y1 + this.clickOffset.top < b && x1 + this.clickOffset.left > l && x1 + this.clickOffset.left < r); return (y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r);
} else { } else {
return (l < x1 + (this.helperProportions.width / 2) // Right Half return (l < x1 + (this.helperProportions.width / 2) // Right Half
@ -146,21 +115,21 @@
}, },
intersectsWithEdge: function(item) { intersectsWithEdge: function(item) {
var x1 = this.position.absolute.left, x2 = x1 + this.helperProportions.width, var x1 = this.positionAbs.left, x2 = x1 + this.helperProportions.width,
y1 = this.position.absolute.top, y2 = y1 + this.helperProportions.height; y1 = this.positionAbs.top, y2 = y1 + this.helperProportions.height;
var l = item.left, r = l + item.width, var l = item.left, r = l + item.width,
t = item.top, b = t + item.height; t = item.top, b = t + item.height;
if(this.options.tolerance == "pointer") { if(this.options.tolerance == "pointer" || (this.options.tolerance == "guess" && this.currentItem[0]['offset'+(this.floating ? 'Width' : 'Height')] > item.item[0]['offset'+(this.floating ? 'Width' : 'Height')])) {
if(!(y1 + this.clickOffset.top > t && y1 + this.clickOffset.top < b && x1 + this.clickOffset.left > l && x1 + this.clickOffset.left < r)) return false; if(!(y1 + this.offset.click.top > t && y1 + this.offset.click.top < b && x1 + this.offset.click.left > l && x1 + this.offset.click.left < r)) return false;
if(this.floating) { if(this.floating) {
if(x1 + this.clickOffset.left > l && x1 + this.clickOffset.left < l + item.width/2) return 2; if(x1 + this.offset.click.left > l && x1 + this.offset.click.left < l + item.width/2) return 2;
if(x1 + this.clickOffset.left > l+item.width/2 && x1 + this.clickOffset.left < r) return 1; if(x1 + this.offset.click.left > l+item.width/2 && x1 + this.offset.click.left < r) return 1;
} else { } else {
if(y1 + this.clickOffset.top > t && y1 + this.clickOffset.top < t + item.height/2) return 2; if(y1 + this.offset.click.top > t && y1 + this.offset.click.top < t + item.height/2) return 2;
if(y1 + this.clickOffset.top > t+item.height/2 && y1 + this.clickOffset.top < b) return 1; if(y1 + this.offset.click.top > t+item.height/2 && y1 + this.offset.click.top < b) return 1;
} }
} else { } else {
@ -183,17 +152,6 @@
return false; return false;
}, },
//This method checks approximately if the item is dragged in a container, but doesn't touch any items
inEmptyZone: function(container) {
if(!$(container.options.items, container.element).length) {
return container.options.dropOnEmpty ? true : false;
};
var last = $(container.options.items, container.element).not('.ui-sortable-helper'); last = $(last[last.length-1]);
var top = last.offset()[this.floating ? 'left' : 'top'] + last[0][this.floating ? 'offsetWidth' : 'offsetHeight'];
return (this.position.absolute[this.floating ? 'left' : 'top'] > top);
},
refresh: function() { refresh: function() {
this.refreshItems(); this.refreshItems();
this.refreshPositions(); this.refreshPositions();
@ -203,7 +161,7 @@
this.items = []; this.items = [];
this.containers = [this]; this.containers = [this];
var items = this.items; var items = this.items;
var queries = [$(this.options.items, this.element)]; var queries = [$.isFunction(this.options.items) ? this.options.items.call(this.element) : $(this.options.items, this.element)];
if(this.options.connectWith) { if(this.options.connectWith) {
for (var i = this.options.connectWith.length - 1; i >= 0; i--){ for (var i = this.options.connectWith.length - 1; i >= 0; i--){
@ -211,7 +169,7 @@
for (var j = cur.length - 1; j >= 0; j--){ for (var j = cur.length - 1; j >= 0; j--){
var inst = $.data(cur[j], 'sortable'); var inst = $.data(cur[j], 'sortable');
if(inst && !inst.options.disabled) { if(inst && !inst.options.disabled) {
queries.push($(inst.options.items, inst.element)); queries.push($.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element));
this.containers.push(inst); this.containers.push(inst);
} }
}; };
@ -251,21 +209,30 @@
this.element this.element
.removeClass("ui-sortable ui-sortable-disabled") .removeClass("ui-sortable ui-sortable-disabled")
.removeData("sortable") .removeData("sortable")
.unbind(".sortable") .unbind(".sortable");
.mouse("destroy"); this.mouseDestroy();
for ( var i = this.items.length - 1; i >= 0; i-- ) for ( var i = this.items.length - 1; i >= 0; i-- )
this.items[i].item.removeData("sortable-item"); this.items[i].item.removeData("sortable-item");
}, },
createPlaceholder: function(that) { createPlaceholder: function(that) {
(that || this).placeholderElement = this.options.placeholderElement ? $(this.options.placeholderElement, (that || this).currentItem) : (that || this).currentItem;
(that || this).placeholder = $('<div></div>') var self = that || this, o = self.options;
.addClass(this.options.placeholder)
.appendTo('body') if(o.placeholder.constructor == String) {
.css({ position: 'absolute' }) var className = o.placeholder;
.css((that || this).placeholderElement.offset()) o.placeholder = {
.css({ width: (that || this).placeholderElement.outerWidth(), height: (that || this).placeholderElement.outerHeight() }) element: function() {
; return $('<div></div>').addClass(className)[0];
},
update: function(i, p) {
p.css(i.offset()).css({ width: i.outerWidth(), height: i.outerHeight() });
}
};
}
self.placeholder = $(o.placeholder.element.call(self.element, self.currentItem)).appendTo('body').css({ position: 'absolute' });
o.placeholder.update.call(self.element, self.currentItem, self.placeholder);
}, },
contactContainers: function(e) { contactContainers: function(e) {
for (var i = this.containers.length - 1; i >= 0; i--){ for (var i = this.containers.length - 1; i >= 0; i--){
@ -277,7 +244,7 @@
if(this.currentContainer != this.containers[i]) { if(this.currentContainer != this.containers[i]) {
//When entering a new container, we will find the item with the least distance and append our item near it //When entering a new container, we will find the item with the least distance and append our item near it
var dist = 10000; var itemWithLeastDistance = null; var base = this.position.absolute[this.containers[i].floating ? 'left' : 'top']; var dist = 10000; var itemWithLeastDistance = null; var base = this.positionAbs[this.containers[i].floating ? 'left' : 'top'];
for (var j = this.items.length - 1; j >= 0; j--) { for (var j = this.items.length - 1; j >= 0; j--) {
if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue; if(!contains(this.containers[i].element[0], this.items[j].item[0])) continue;
var cur = this.items[j][this.containers[i].floating ? 'left' : 'top']; var cur = this.items[j][this.containers[i].floating ? 'left' : 'top'];
@ -286,12 +253,15 @@
} }
} }
if(!itemWithLeastDistance && !this.options.dropOnEmpty) //Check if dropOnEmpty is enabled
continue;
//We also need to exchange the placeholder //We also need to exchange the placeholder
if(this.placeholder) this.placeholder.remove(); if(this.placeholder) this.placeholder.remove();
if(this.containers[i].options.placeholder) { if(this.containers[i].options.placeholder) {
this.containers[i].createPlaceholder(this); this.containers[i].createPlaceholder(this);
} else { } else {
this.placeholder = null; this.placeholderElement = null; this.placeholder = null;;
} }
@ -314,126 +284,188 @@
}; };
}, },
start: function(e,el) { mouseStart: function(e, overrideHandle, noActivation) {
var o = this.options; var o = this.options;
this.currentContainer = this; this.currentContainer = this;
if(this.options.disabled || this.options.type == 'static') return false;
//Find out if the clicked node (or one of its parents) is a actual item in this.items
var currentItem = null, nodes = $(e.target).parents().each(function() {
if($.data(this, 'sortable-item')) {
currentItem = $(this);
return false;
}
});
if($.data(e.target, 'sortable-item')) currentItem = $(e.target);
if(!currentItem) return false;
if(this.options.handle && !overrideHandle) {
var validHandle = false;
$(this.options.handle, currentItem).each(function() { if(this == e.target) validHandle = true; });
if(!validHandle) return false;
}
this.currentItem = currentItem;
this.refresh(); this.refresh();
//Create and append the visible helper //Create and append the visible helper
this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone(); this.helper = typeof o.helper == 'function' ? $(o.helper.apply(this.element[0], [e, this.currentItem])) : this.currentItem.clone();
if(!this.helper.parents('body').length) this.helper.appendTo(o.appendTo || this.currentItem[0].parentNode); //Add the helper to the DOM if that didn't happen already if(!this.helper.parents('body').length) this.helper.appendTo((o.appendTo != 'parent' ? o.appendTo : this.currentItem[0].parentNode)); //Add the helper to the DOM if that didn't happen already
this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class this.helper.css({ position: 'absolute', clear: 'both' }).addClass('ui-sortable-helper'); //Position it absolutely and add a helper class
//Prepare variables for position generation /*
$.extend(this, { * - Position generation -
offsetParent: this.helper.offsetParent(), * This block generates everything position related - it's the core of draggables.
offsets: { */
absolute: this.currentItem.offset()
},
mouse: {
start: { top: e.pageY, left: e.pageX }
},
margins: {
top: parseInt(this.currentItem.css("marginTop")) || 0,
left: parseInt(this.currentItem.css("marginLeft")) || 0
}
});
//The relative click offset this.margins = { //Cache the margins
this.offsets.parent = this.offsetParent.offset(); left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
this.clickOffset = { left: e.pageX - this.offsets.absolute.left, top: e.pageY - this.offsets.absolute.top }; top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
this.originalPosition = {
left: this.offsets.absolute.left - this.offsets.parent.left - this.margins.left,
top: this.offsets.absolute.top - this.offsets.parent.top - this.margins.top
}
//Generate a flexible offset that will later be subtracted from e.pageX/Y
//I hate margins - they need to be removed before positioning the element absolutely..
this.offset = {
left: e.pageX - this.originalPosition.left,
top: e.pageY - this.originalPosition.top
}; };
//Save the first time position this.offset = this.currentItem.offset(); //The element's absolute position on the page
$.extend(this, { this.offset = { //Substract the margins from the element's absolute offset
position: { top: this.offset.top - this.margins.top,
current: { top: e.pageY - this.offset.top, left: e.pageX - this.offset.left }, left: this.offset.left - this.margins.left
absolute: { left: e.pageX - this.clickOffset.left, top: e.pageY - this.clickOffset.top }, };
dom: this.currentItem.prev()[0]
this.offset.click = { //Where the click happened, relative to the element
left: e.pageX - this.offset.left,
top: e.pageY - this.offset.top
};
this.offsetParent = this.helper.offsetParent(); var po = this.offsetParent.offset(); //Get the offsetParent and cache its position
this.offset.parent = { //Store its position plus border
top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
};
this.originalPosition = this.generatePosition(e); //Generate the original position
this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Cache the helper size
if(o.cursorAt) {
if(o.cursorAt.left != undefined) this.offset.click.left = o.cursorAt.left;
if(o.cursorAt.right != undefined) this.offset.click.left = this.helperProportions.width - o.cursorAt.right;
if(o.cursorAt.top != undefined) this.offset.click.top = o.cursorAt.top;
if(o.cursorAt.bottom != undefined) this.offset.click.top = this.helperProportions.height - o.cursorAt.bottom;
}
this.domPosition = this.currentItem.prev()[0]; //Cache the former DOM position
/*
* - Position constraining -
* Here we prepare position constraining like grid and containment.
*/
if(o.containment) {
if(o.containment == 'parent') o.containment = this.helper[0].parentNode;
if(o.containment == 'document') this.containment = [0,0,$(document).width(), ($(document).height() || document.body.parentNode.scrollHeight)];
if(!(/^(document|window|parent)$/).test(o.containment)) {
var ce = $(o.containment)[0];
var co = $(o.containment).offset();
this.containment = [
co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left,
co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top,
co.left+Math.max(ce.scrollWidth,ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - this.offset.parent.left - this.helperProportions.width - this.margins.left - (parseInt(this.currentItem.css("marginRight"),10) || 0),
co.top+Math.max(ce.scrollHeight,ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - this.offset.parent.top - this.helperProportions.height - this.margins.top - (parseInt(this.currentItem.css("marginBottom"),10) || 0)
];
}
} }
});
//If o.placeholder is used, create a new element at the given position with the class //If o.placeholder is used, create a new element at the given position with the class
if(o.placeholder) this.createPlaceholder(); if(o.placeholder) this.createPlaceholder();
this.propagate("start", e); //Call plugins and callbacks //Call plugins and callbacks
this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() }; //Save and store the helper proportions this.propagate("start", e);
this.helperProportions = { width: this.helper.outerWidth(), height: this.helper.outerHeight() };//Recache the helper size
//If we have something in cursorAt, we'll use it if(this.options.placeholder != 'clone') this.currentItem.css('visibility', 'hidden'); //Set the original element visibility to hidden to still fill out the white space
if(o.cursorAt) {
if(o.cursorAt.top != undefined || o.cursorAt.bottom != undefined) {
this.offset.top -= this.clickOffset.top - (o.cursorAt.top != undefined ? o.cursorAt.top : (this.helperProportions.height - o.cursorAt.bottom));
this.clickOffset.top = (o.cursorAt.top != undefined ? o.cursorAt.top : (this.helperProportions.height - o.cursorAt.bottom));
}
if(o.cursorAt.left != undefined || o.cursorAt.right != undefined) {
this.offset.left -= this.clickOffset.left - (o.cursorAt.left != undefined ? o.cursorAt.left : (this.helperProportions.width - o.cursorAt.right));
this.clickOffset.left = (o.cursorAt.left != undefined ? o.cursorAt.left : (this.helperProportions.width - o.cursorAt.right));
}
}
if(this.options.placeholder != 'clone') $(this.currentItem).css('visibility', 'hidden'); //Set the original element visibility to hidden to still fill out the white space if(!noActivation) {
for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); } //Post 'activate' events to possible containers for (var i = this.containers.length - 1; i >= 0; i--) { this.containers[i].propagate("activate", e, this); } //Post 'activate' events to possible containers
}
//Prepare possible droppables //Prepare possible droppables
if($.ui.ddmanager) $.ui.ddmanager.current = this; if($.ui.ddmanager) $.ui.ddmanager.current = this;
if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e); if ($.ui.ddmanager && !o.dropBehaviour) $.ui.ddmanager.prepareOffsets(this, e);
this.dragging = true; this.dragging = true;
return false;
this.mouseDrag(e); //Execute the drag once - this causes the helper not to be visible before getting its correct position
return true;
}, },
stop: function(e) { convertPositionTo: function(d, pos) {
if(!pos) pos = this.position;
this.propagate("stop", e); //Call plugins and trigger callbacks var mod = d == "absolute" ? 1 : -1;
if(this.position.dom != this.currentItem.prev()[0]) this.propagate("update", e); //Trigger update callback if the DOM position has changed return {
if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element top: (
this.propagate("remove", e); pos.top // the calculated relative position
for (var i = this.containers.length - 1; i >= 0; i--){ + this.offset.parent.top * mod // The offsetParent's offset without borders (offset + border)
if(contains(this.containers[i].element[0], this.currentItem[0])) { - (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) * mod // The offsetParent's scroll position
this.containers[i].propagate("update", e, this); + this.margins.top * mod //Add the margin (you don't want the margin counting in intersection methods)
this.containers[i].propagate("receive", e, this); ),
} left: (
pos.left // the calculated relative position
+ this.offset.parent.left * mod // The offsetParent's offset without borders (offset + border)
- (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) * mod // The offsetParent's scroll position
+ this.margins.left * mod //Add the margin (you don't want the margin counting in intersection methods)
)
}; };
};
//Post events to containers
for (var i = this.containers.length - 1; i >= 0; i--){
this.containers[i].propagate("deactivate", e, this);
if(this.containers[i].containerCache.over) {
this.containers[i].propagate("out", e, this);
this.containers[i].containerCache.over = 0;
}
}
//If we are using droppables, inform the manager about the drop
if ($.ui.ddmanager && !this.options.dropBehaviour) $.ui.ddmanager.drop(this, e);
this.dragging = false;
if(this.cancelHelperRemoval) return false;
$(this.currentItem).css('visibility', '');
if(this.placeholder) this.placeholder.remove();
this.helper.remove();
return false;
}, },
drag: function(e) { generatePosition: function(e) {
var o = this.options;
var position = {
top: (
e.pageY // The absolute mouse position
- this.offset.click.top // Click offset (relative to the element)
- this.offset.parent.top // The offsetParent's offset without borders (offset + border)
+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop) // The offsetParent's scroll position, not if the element is fixed
),
left: (
e.pageX // The absolute mouse position
- this.offset.click.left // Click offset (relative to the element)
- this.offset.parent.left // The offsetParent's offset without borders (offset + border)
+ (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft) // The offsetParent's scroll position, not if the element is fixed
)
};
if(!this.originalPosition) return position; //If we are not dragging yet, we won't check for options
/*
* - Position constraining -
* Constrain the position to a mix of grid, containment.
*/
if(this.containment) {
if(position.left < this.containment[0]) position.left = this.containment[0];
if(position.top < this.containment[1]) position.top = this.containment[1];
if(position.left > this.containment[2]) position.left = this.containment[2];
if(position.top > this.containment[3]) position.top = this.containment[3];
}
if(o.grid) {
var top = this.originalPosition.top + Math.round((position.top - this.originalPosition.top) / o.grid[1]) * o.grid[1];
position.top = this.containment ? (!(top < this.containment[1] || top > this.containment[3]) ? top : (!(top < this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
var left = this.originalPosition.left + Math.round((position.left - this.originalPosition.left) / o.grid[0]) * o.grid[0];
position.left = this.containment ? (!(left < this.containment[0] || left > this.containment[2]) ? left : (!(left < this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
}
return position;
},
mouseDrag: function(e) {
//Compute the helpers position //Compute the helpers position
this.position.current = { top: e.pageY - this.offset.top, left: e.pageX - this.offset.left }; this.position = this.generatePosition(e);
this.position.absolute = { left: e.pageX - this.clickOffset.left, top: e.pageY - this.clickOffset.top }; this.positionAbs = this.convertPositionTo("absolute");
//Rearrange //Rearrange
for (var i = this.items.length - 1; i >= 0; i--) { for (var i = this.items.length - 1; i >= 0; i--) {
@ -456,36 +488,103 @@
//Post events to containers //Post events to containers
this.contactContainers(e); this.contactContainers(e);
//Call plugins and callbacks
this.propagate("sort", e);
if(!this.options.axis || this.options.axis == "x") this.helper[0].style.left = this.position.left+'px';
if(!this.options.axis || this.options.axis == "y") this.helper[0].style.top = this.position.top+'px';
//Interconnect with droppables //Interconnect with droppables
if($.ui.ddmanager) $.ui.ddmanager.drag(this, e); if($.ui.ddmanager) $.ui.ddmanager.drag(this, e);
this.propagate("sort", e); //Call plugins and callbacks
this.helper.css({ left: this.position.current.left+'px', top: this.position.current.top+'px' }); // Stick the helper to the cursor
return false; return false;
},
mouseStop: function(e, noPropagation) {
//If we are using droppables, inform the manager about the drop
if ($.ui.ddmanager && !this.options.dropBehaviour)
$.ui.ddmanager.drop(this, e);
if(this.options.revert) {
var self = this;
var cur = self.currentItem.offset();
//Also animate the placeholder if we have one
if(self.placeholder) self.placeholder.animate({ opacity: 'hide' }, (parseInt(this.options.revert, 10) || 500)-50);
$(this.helper).animate({
left: cur.left - this.offset.parent.left - self.margins.left + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollLeft),
top: cur.top - this.offset.parent.top - self.margins.top + (this.offsetParent[0] == document.body ? 0 : this.offsetParent[0].scrollTop)
}, parseInt(this.options.revert, 10) || 500, function() {
self.propagate("stop", e, null, noPropagation);
self.clear(e);
});
} else {
this.propagate("stop", e, null, noPropagation);
this.clear(e, noPropagation);
}
return false;
},
clear: function(e, noPropagation) {
if(this.domPosition != this.currentItem.prev()[0]) this.propagate("update", e, null, noPropagation); //Trigger update callback if the DOM position has changed
if(!contains(this.element[0], this.currentItem[0])) { //Node was moved out of the current element
this.propagate("remove", e, null, noPropagation);
for (var i = this.containers.length - 1; i >= 0; i--){
if(contains(this.containers[i].element[0], this.currentItem[0])) {
this.containers[i].propagate("update", e, this, noPropagation);
this.containers[i].propagate("receive", e, this, noPropagation);
}
};
};
//Post events to containers
for (var i = this.containers.length - 1; i >= 0; i--){
this.containers[i].propagate("deactivate", e, this, noPropagation);
if(this.containers[i].containerCache.over) {
this.containers[i].propagate("out", e, this);
this.containers[i].containerCache.over = 0;
}
}
this.dragging = false;
if(this.cancelHelperRemoval) return false;
$(this.currentItem).css('visibility', '');
if(this.placeholder) this.placeholder.remove();
this.helper.remove();
return true;
}, },
rearrange: function(e, i, a) { rearrange: function(e, i, a) {
a ? a.append(this.currentItem) : i.item[this.direction == 'down' ? 'before' : 'after'](this.currentItem); a ? a.append(this.currentItem) : i.item[this.direction == 'down' ? 'before' : 'after'](this.currentItem);
this.refreshPositions(true); //Precompute after each DOM insertion, NOT on mousemove this.refreshPositions(true); //Precompute after each DOM insertion, NOT on mousemove
if(this.placeholderElement) this.placeholder.css(this.placeholderElement.offset()); if(this.options.placeholder) this.options.placeholder.update.call(this.element, this.currentItem, this.placeholder);
if(this.placeholderElement && this.placeholderElement.is(":visible")) this.placeholder.css({ width: this.placeholderElement.outerWidth(), height: this.placeholderElement.outerHeight() });
} }
}); }));
$.extend($.ui.sortable, { $.extend($.ui.sortable, {
getter: "serialize toArray", getter: "serialize toArray",
defaults: { defaults: {
tolerance: "guess",
distance: 0,
delay: 0,
cancel: ":input,button",
items: '> *', items: '> *',
zIndex: 1000 zIndex: 1000,
dropOnEmpty: true,
appendTo: "parent"
} }
}); });
/* /*
* Sortable Extensions * Sortable Extensions
*/ */
$.ui.plugin.add("sortable", "cursor", { $.ui.plugin.add("sortable", "cursor", {
start: function(e, ui) { start: function(e, ui) {
var t = $('body'); var t = $('body');
if (t.css("cursor")) ui.options._cursor = t.css("cursor"); if (t.css("cursor")) ui.options._cursor = t.css("cursor");
@ -494,9 +593,9 @@
stop: function(e, ui) { stop: function(e, ui) {
if (ui.options._cursor) $('body').css("cursor", ui.options._cursor); if (ui.options._cursor) $('body').css("cursor", ui.options._cursor);
} }
}); });
$.ui.plugin.add("sortable", "zIndex", { $.ui.plugin.add("sortable", "zIndex", {
start: function(e, ui) { start: function(e, ui) {
var t = ui.helper; var t = ui.helper;
if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex"); if(t.css("zIndex")) ui.options._zIndex = t.css("zIndex");
@ -505,9 +604,9 @@
stop: function(e, ui) { stop: function(e, ui) {
if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex); if(ui.options._zIndex) $(ui.helper).css('zIndex', ui.options._zIndex);
} }
}); });
$.ui.plugin.add("sortable", "opacity", { $.ui.plugin.add("sortable", "opacity", {
start: function(e, ui) { start: function(e, ui) {
var t = ui.helper; var t = ui.helper;
if(t.css("opacity")) ui.options._opacity = t.css("opacity"); if(t.css("opacity")) ui.options._opacity = t.css("opacity");
@ -516,131 +615,39 @@
stop: function(e, ui) { stop: function(e, ui) {
if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity); if(ui.options._opacity) $(ui.helper).css('opacity', ui.options._opacity);
} }
}); });
$.ui.plugin.add("sortable", "scroll", {
$.ui.plugin.add("sortable", "revert", {
stop: function(e, ui) {
var self = ui.instance;
self.cancelHelperRemoval = true;
var cur = self.currentItem.offset();
var op = self.helper.offsetParent().offset();
if(ui.instance.options.zIndex) ui.helper.css('zIndex', ui.instance.options.zIndex); //Do the zIndex again because it already was resetted by the plugin above on stop
//Also animate the placeholder if we have one
if(ui.instance.placeholder) ui.instance.placeholder.animate({ opacity: 'hide' }, parseInt(ui.options.revert, 10) || 500);
ui.helper.animate({
left: cur.left - op.left - self.margins.left,
top: cur.top - op.top - self.margins.top
}, parseInt(ui.options.revert, 10) || 500, function() {
self.currentItem.css('visibility', 'visible');
window.setTimeout(function() {
if(self.placeholder) self.placeholder.remove();
self.helper.remove();
if(ui.options._zIndex) ui.helper.css('zIndex', ui.options._zIndex);
}, 50);
});
}
});
$.ui.plugin.add("sortable", "containment", {
start: function(e, ui) {
var o = ui.options;
if((o.containment.left != undefined || o.containment.constructor == Array) && !o._containment) return;
if(!o._containment) o._containment = o.containment;
if(o._containment == 'parent') o._containment = this[0].parentNode;
if(o._containment == 'sortable') o._containment = this[0];
if(o._containment == 'document') {
o.containment = [
0,
0,
$(document).width(),
($(document).height() || document.body.parentNode.scrollHeight)
];
} else { //I'm a node, so compute top/left/right/bottom
var ce = $(o._containment);
var co = ce.offset();
o.containment = [
co.left,
co.top,
co.left+(ce.outerWidth() || ce[0].scrollWidth),
co.top+(ce.outerHeight() || ce[0].scrollHeight)
];
}
},
sort: function(e, ui) {
var o = ui.options;
var h = ui.helper;
var c = o.containment;
var self = ui.instance;
var borderLeft = (parseInt(self.offsetParent.css("borderLeftWidth"), 10) || 0);
var borderRight = (parseInt(self.offsetParent.css("borderRightWidth"), 10) || 0);
var borderTop = (parseInt(self.offsetParent.css("borderTopWidth"), 10) || 0);
var borderBottom = (parseInt(self.offsetParent.css("borderBottomWidth"), 10) || 0);
if(c.constructor == Array) {
if((self.position.absolute.left < c[0])) self.position.current.left = c[0] - self.offsets.parent.left - self.margins.left;
if((self.position.absolute.top < c[1])) self.position.current.top = c[1] - self.offsets.parent.top - self.margins.top;
if(self.position.absolute.left - c[2] + self.helperProportions.width >= 0) self.position.current.left = c[2] - self.offsets.parent.left - self.helperProportions.width - self.margins.left - borderLeft - borderRight;
if(self.position.absolute.top - c[3] + self.helperProportions.height >= 0) self.position.current.top = c[3] - self.offsets.parent.top - self.helperProportions.height - self.margins.top - borderTop - borderBottom;
} else {
if((ui.position.left < c.left)) self.position.current.left = c.left;
if((ui.position.top < c.top)) self.position.current.top = c.top;
if(ui.position.left - self.offsetParent.innerWidth() + self.helperProportions.width + c.right + borderLeft + borderRight >= 0) self.position.current.left = self.offsetParent.innerWidth() - self.helperProportions.width - c.right - borderLeft - borderRight;
if(ui.position.top - self.offsetParent.innerHeight() + self.helperProportions.height + c.bottom + borderTop + borderBottom >= 0) self.position.current.top = self.offsetParent.innerHeight() - self.helperProportions.height - c.bottom - borderTop - borderBottom;
}
}
});
$.ui.plugin.add("sortable", "axis", {
sort: function(e, ui) {
var o = ui.options;
if(o.constraint) o.axis = o.constraint; //Legacy check
o.axis == 'x' ? ui.instance.position.current.top = ui.instance.originalPosition.top : ui.instance.position.current.left = ui.instance.originalPosition.left;
}
});
$.ui.plugin.add("sortable", "scroll", {
start: function(e, ui) { start: function(e, ui) {
var o = ui.options; var o = ui.options;
var i = $(this).data("sortable");
o.scrollSensitivity = o.scrollSensitivity || 20; o.scrollSensitivity = o.scrollSensitivity || 20;
o.scrollSpeed = o.scrollSpeed || 20; o.scrollSpeed = o.scrollSpeed || 20;
ui.instance.overflowY = function(el) { i.overflowY = function(el) {
do { if((/auto|scroll/).test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode); do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-y'))) return el; el = el.parent(); } while (el[0].parentNode);
return $(document); return $(document);
}(this); }(i.currentItem);
ui.instance.overflowX = function(el) { i.overflowX = function(el) {
do { if((/auto|scroll/).test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode); do { if(/auto|scroll/.test(el.css('overflow')) || (/auto|scroll/).test(el.css('overflow-x'))) return el; el = el.parent(); } while (el[0].parentNode);
return $(document); return $(document);
}(this); }(i.currentItem);
if(ui.instance.overflowY[0] != document && ui.instance.overflowY[0].tagName != 'HTML') ui.instance.overflowYstart = ui.instance.overflowY[0].scrollTop; if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') i.overflowYOffset = i.overflowY.offset();
if(ui.instance.overflowX[0] != document && ui.instance.overflowX[0].tagName != 'HTML') ui.instance.overflowXstart = ui.instance.overflowX[0].scrollLeft; if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') i.overflowXOffset = i.overflowX.offset();
}, },
sort: function(e, ui) { sort: function(e, ui) {
var o = ui.options; var o = ui.options;
var i = ui.instance; var i = $(this).data("sortable");
if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') { if(i.overflowY[0] != document && i.overflowY[0].tagName != 'HTML') {
if(i.overflowY[0].offsetHeight - (ui.position.top - i.overflowY[0].scrollTop + i.clickOffset.top) < o.scrollSensitivity) if((i.overflowYOffset.top + i.overflowY[0].offsetHeight) - e.pageY < o.scrollSensitivity)
i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed; i.overflowY[0].scrollTop = i.overflowY[0].scrollTop + o.scrollSpeed;
if((ui.position.top - i.overflowY[0].scrollTop + i.clickOffset.top) < o.scrollSensitivity) if(e.pageY - i.overflowYOffset.top < o.scrollSensitivity)
i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed; i.overflowY[0].scrollTop = i.overflowY[0].scrollTop - o.scrollSpeed;
} else { } else {
//$(document.body).append('<p>'+(e.pageY - $(document).scrollTop())+'</p>');
if(e.pageY - $(document).scrollTop() < o.scrollSensitivity) if(e.pageY - $(document).scrollTop() < o.scrollSensitivity)
$(document).scrollTop($(document).scrollTop() - o.scrollSpeed); $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity) if($(window).height() - (e.pageY - $(document).scrollTop()) < o.scrollSensitivity)
@ -648,9 +655,9 @@
} }
if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') { if(i.overflowX[0] != document && i.overflowX[0].tagName != 'HTML') {
if(i.overflowX[0].offsetWidth - (ui.position.left - i.overflowX[0].scrollLeft + i.clickOffset.left) < o.scrollSensitivity) if((i.overflowXOffset.left + i.overflowX[0].offsetWidth) - e.pageX < o.scrollSensitivity)
i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed; i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft + o.scrollSpeed;
if((ui.position.top - i.overflowX[0].scrollLeft + i.clickOffset.left) < o.scrollSensitivity) if(e.pageX - i.overflowXOffset.left < o.scrollSensitivity)
i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed; i.overflowX[0].scrollLeft = i.overflowX[0].scrollLeft - o.scrollSpeed;
} else { } else {
if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity) if(e.pageX - $(document).scrollLeft() < o.scrollSensitivity)
@ -659,13 +666,7 @@
$(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed); $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
} }
//ui.instance.recallOffset(e);
i.offset = {
left: i.mouse.start.left - i.originalPosition.left + (i.overflowXstart !== undefined ? i.overflowXstart - i.overflowX[0].scrollLeft : 0),
top: i.mouse.start.top - i.originalPosition.top + (i.overflowYstart !== undefined ? i.overflowYstart - i.overflowX[0].scrollTop : 0)
};
} }
}); });
})(jQuery); })(jQuery);

18
wp-includes/js/jquery/ui.tabs.js
View File

@ -14,7 +14,7 @@
*/ */
;(function($) { ;(function($) {
$.widget("ui.tabs", { $.widget("ui.tabs", {
init: function() { init: function() {
this.options.event += '.tabs'; // namespace event this.options.event += '.tabs'; // namespace event
@ -321,7 +321,7 @@
index = this.$tabs.length; // append by default index = this.$tabs.length; // append by default
var o = this.options; var o = this.options;
var $li = $(o.tabTemplate.replace(/#\{href\}/, url).replace(/#\{label\}/, label)); var $li = $(o.tabTemplate.replace(/#\{href\}/g, url).replace(/#\{label\}/g, label));
$li.data('destroy.tabs', true); $li.data('destroy.tabs', true);
var id = url.indexOf('#') == 0 ? url.replace('#', '') : this.tabId( $('a:first-child', $li)[0] ); var id = url.indexOf('#') == 0 ? url.replace('#', '') : this.tabId( $('a:first-child', $li)[0] );
@ -509,9 +509,9 @@
o.disabledClass, o.panelClass, o.hideClass].join(' ')); o.disabledClass, o.panelClass, o.hideClass].join(' '));
}); });
} }
}); });
$.ui.tabs.defaults = { $.ui.tabs.defaults = {
// basic setup // basic setup
unselect: false, unselect: false,
event: 'click', event: 'click',
@ -540,18 +540,18 @@
panelClass: 'ui-tabs-panel', panelClass: 'ui-tabs-panel',
hideClass: 'ui-tabs-hide', hideClass: 'ui-tabs-hide',
loadingClass: 'ui-tabs-loading' loadingClass: 'ui-tabs-loading'
}; };
$.ui.tabs.getter = "length"; $.ui.tabs.getter = "length";
/* /*
* Tabs Extensions * Tabs Extensions
*/ */
/* /*
* Rotate * Rotate
*/ */
$.extend($.ui.tabs.prototype, { $.extend($.ui.tabs.prototype, {
rotation: null, rotation: null,
rotate: function(ms, continuing) { rotate: function(ms, continuing) {
@ -590,6 +590,6 @@
this.$tabs.unbind(this.options.event, stop); this.$tabs.unbind(this.options.event, stop);
} }
} }
}); });
})(jQuery); })(jQuery);