catch up to master
This commit is contained in:
parent
fb62a95f57
commit
a903b5d3c1
@ -1625,6 +1625,20 @@ $("#select").select2({
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row zebra">
|
||||||
|
<div class="span12">
|
||||||
|
<h3>select</h3>
|
||||||
|
<p>Fired when a choice is being selected in the dropdown, but before any modification has been made to the selection.
|
||||||
|
This event is used to allow the user to reject selection by calling <code>event.preventDefault()</code></p>
|
||||||
|
</p>
|
||||||
|
<p>The event object contains the following custom properties:
|
||||||
|
<dl>
|
||||||
|
<dt>val</dt><dd>the id of the highlighted choice object</dd>
|
||||||
|
<dt>object</dt><dd>the choice object about to be selected</dd>
|
||||||
|
</dl>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
<h3>selected</h3>
|
<h3>selected</h3>
|
||||||
@ -1633,7 +1647,7 @@ $("#select").select2({
|
|||||||
<p>The event object contains the following custom properties:
|
<p>The event object contains the following custom properties:
|
||||||
<dl>
|
<dl>
|
||||||
<dt>val</dt><dd>the id of the highlighted choice object</dd>
|
<dt>val</dt><dd>the id of the highlighted choice object</dd>
|
||||||
<dt>object</dt><dd>the highlighted choice object</dd>
|
<dt>object</dt><dd>the choice object that was selected</dd>
|
||||||
</dl>
|
</dl>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 2bf5a763c5e884cdf0295aa0d5072968bab941e2
|
Subproject commit dc27a5b74d78c1f04306caba576c27973311424b
|
@ -59,20 +59,7 @@
|
|||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
|
|
||||||
<script>
|
|
||||||
$(document).ready(function() {
|
|
||||||
var el=$("#focus-spy");
|
|
||||||
$(window).bind("scroll", function(){ el.css({top:$(window).scrollTop()}); });
|
|
||||||
var update=function() {
|
|
||||||
var a=document.activeElement;
|
|
||||||
var b=$(a);
|
|
||||||
el.html("tag: "+a.tagName+" id:"+a.id+" class:"+b.attr("class")+" val:"+b.val());
|
|
||||||
window.setTimeout(update, 100);
|
|
||||||
};
|
|
||||||
update();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
<script id="script_e6">
|
<script id="script_e6">
|
||||||
|
|
||||||
function movieFormatResult(movie) {
|
function movieFormatResult(movie) {
|
||||||
@ -127,5 +114,22 @@
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
<div style="position: absolute; left:0; top:0; background: white; border: 1px solid red;" id="focus-spy">hello there</div>
|
||||||
|
<script>
|
||||||
|
$(document).ready(function() {
|
||||||
|
var el=$("#focus-spy");
|
||||||
|
$(window).bind("scroll", function(){ el.css({top:$(window).scrollTop()}); });
|
||||||
|
var update=function() {
|
||||||
|
var a=document.activeElement;
|
||||||
|
var b=$(a);
|
||||||
|
el.html("tag: "+a.tagName+" id:"+a.id+" class:"+b.attr("class")+" val:"+b.val());
|
||||||
|
window.setTimeout(update, 100);
|
||||||
|
};
|
||||||
|
update();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
Loading…
Reference in New Issue
Block a user