From 9c0942d14f25909bf8e3b8064965323c280f4274 Mon Sep 17 00:00:00 2001
From: Paul Bakaus <paul.bakaus@googlemail.com>
Date: Thu, 18 Sep 2008 09:51:50 +0000
Subject: droppable: $.ui.ddmanager.drop now returns false in case of non-drop,
 or the actual droppable (instead of true) in the case of a drop. draggable:
 implemented patch that allows revert to be a callback, receives one argument
 which is the droppable (implements #3175)

---
 ui/ui.draggable.js | 2 +-
 ui/ui.droppable.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/ui.draggable.js b/ui/ui.draggable.js
index 1179c7df8..fa8fbc611 100644
--- a/ui/ui.draggable.js
+++ b/ui/ui.draggable.js
@@ -309,7 +309,7 @@ $.widget("ui.draggable", $.extend({}, $.ui.mouse, {
 		if ($.ui.ddmanager && !this.options.dropBehaviour)
 			var dropped = $.ui.ddmanager.drop(this, e);		
 		
-		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true) {
+		if((this.options.revert == "invalid" && !dropped) || (this.options.revert == "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
 			var self = this;
 			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10) || 500, function() {
 				self._propagate("stop", e);
diff --git a/ui/ui.droppable.js b/ui/ui.droppable.js
index 839ac0311..5d14a64d2 100644
--- a/ui/ui.droppable.js
+++ b/ui/ui.droppable.js
@@ -107,7 +107,7 @@ $.widget("ui.droppable", {
 		if(this.options.accept.call(this.element,(draggable.currentItem || draggable.element))) {
 			$.ui.plugin.call(this, 'drop', [e, this.ui(draggable)]);
 			this.element.triggerHandler("drop", [e, this.ui(draggable)], this.options.drop);
-			return true;
+			return this.element;
 		}
 		
 		return false;
-- 
cgit v1.2.3

able'>4.1-stable</option>
<option value='4.2-stable'>4.2-stable</option>
<option value='5.0-stable'>5.0-stable</option>
<option value='5.1-stable'>5.1-stable</option>
<option value='6.0-stable'>6.0-stable</option>
<option value='integration-to-svn-stable-1.0'>integration-to-svn-stable-1.0</option>
<option value='integration-to-svn-trunk'>integration-to-svn-trunk</option>
<option value='master' selected='selected'>master</option>
<option value='nbc'>nbc</option>
<option value='plugin-hooks'>plugin-hooks</option>
<option value='swistak'>swistak</option>
<option value='work'>work</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Mirror of redmine code source: https://github.com/redmine/redmine</td><td class='sub right'>www-data</td></tr></table>
<table class='tabs'><tr><td>
<a href='/redmine.git/'>summary</a><a href='/redmine.git/refs/?id=868578c0f297875eeac324af8a8c7f1445593ecd'>refs</a><a href='/redmine.git/log/app/views/issues/bulk_edit.js.erb'>log</a><a class='active' href='/redmine.git/tree/app/views/issues/bulk_edit.js.erb?id=868578c0f297875eeac324af8a8c7f1445593ecd'>tree</a><a href='/redmine.git/commit/app/views/issues/bulk_edit.js.erb?id=868578c0f297875eeac324af8a8c7f1445593ecd'>commit</a><a href='/redmine.git/diff/app/views/issues/bulk_edit.js.erb?id=868578c0f297875eeac324af8a8c7f1445593ecd'>diff</a><a href='/redmine.git/stats/app/views/issues/bulk_edit.js.erb'>stats</a></td><td class='form'><form class='right' method='get' action='/redmine.git/log/app/views/issues/bulk_edit.js.erb'>
<input type='hidden' name='id' value='868578c0f297875eeac324af8a8c7f1445593ecd'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/redmine.git/tree/?id=868578c0f297875eeac324af8a8c7f1445593ecd'>root</a>/<a href='/redmine.git/tree/app?id=868578c0f297875eeac324af8a8c7f1445593ecd'>app</a>/<a href='/redmine.git/tree/app/views?id=868578c0f297875eeac324af8a8c7f1445593ecd'>views</a>/<a href='/redmine.git/tree/app/views/issues?id=868578c0f297875eeac324af8a8c7f1445593ecd'>issues</a>/<a href='/redmine.git/tree/app/views/issues/bulk_edit.js.erb?id=868578c0f297875eeac324af8a8c7f1445593ecd'>bulk_edit.js.erb</a></div><div class='content'>blob: ac84ad1d9f59c818770fa5053a3ac0eff337803f (<a href='/redmine.git/plain/app/views/issues/bulk_edit.js.erb?id=868578c0f297875eeac324af8a8c7f1445593ecd'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
</pre></td>
<td class='lines'><pre><code><style>pre { line-height: 125%; }
td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; }
td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; }
.highlight .hll { background-color: #ffffcc }
.highlight .c { color: #888888 } /* Comment */
.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */
.highlight .k { color: #008800; font-weight: bold } /* Keyword */
.highlight .ch { color: #888888 } /* Comment.Hashbang */
.highlight .cm { color: #888888 } /* Comment.Multiline */
.highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */
.highlight .cpf { color: #888888 } /* Comment.PreprocFile */
.highlight .c1 { color: #888888 } /* Comment.Single */
.highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */
.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
.highlight .ge { font-style: italic } /* Generic.Emph */
.highlight .gr { color: #aa0000 } /* Generic.Error */
.highlight .gh { color: #333333 } /* Generic.Heading */
.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
.highlight .go { color: #888888 } /* Generic.Output */
.highlight .gp { color: #555555 } /* Generic.Prompt */
.highlight .gs { font-weight: bold } /* Generic.Strong */
.highlight .gu { color: #666666 } /* Generic.Subheading */
.highlight .gt { color: #aa0000 } /* Generic.Traceback */
.highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */
.highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */
.highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */
.highlight .kp { color: #008800 } /* Keyword.Pseudo */
.highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */
.highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */
.highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */
.highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */
.highlight .na { color: #336699 } /* Name.Attribute */
.highlight .nb { color: #003388 } /* Name.Builtin */
.highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */
.highlight .no { color: #003366; font-weight: bold } /* Name.Constant */
.highlight .nd { color: #555555 } /* Name.Decorator */
.highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */
.highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */
.highlight .nl { color: #336699; font-style: italic } /* Name.Label */
.highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */
.highlight .py { color: #336699; font-weight: bold } /* Name.Property */
.highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */
.highlight .nv { color: #336699 } /* Name.Variable */
.highlight .ow { color: #008800 } /* Operator.Word */
.highlight .w { color: #bbbbbb } /* Text.Whitespace */
.highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */
.highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */
.highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */
.highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */
.highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */
.highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */
.highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */
.highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */
.highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */
.highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */
.highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */
.highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */
.highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */
.highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */
.highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */
.highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */
.highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */
.highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */
.highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */
.highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */
.highlight .vc { color: #336699 } /* Name.Variable.Class */
.highlight .vg { color: #dd7700 } /* Name.Variable.Global */
.highlight .vi { color: #3333bb } /* Name.Variable.Instance */
.highlight .vm { color: #336699 } /* Name.Variable.Magic */
.highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */</style><div class="highlight"><pre><span></span>$(&#39;#content&#39;).html(&#39;&lt;%= escape_javascript(render :template =&gt; &#39;issues/bulk_edit&#39;, :formats =&gt; [:html]) %&gt;&#39;);
</pre></div>