RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-22 13:06:08 +03:00
Code Issues Projects Releases Wiki Activity

catch up to master

Browse Source
This commit is contained in:
Igor Vaynberg 2013-04-09 19:53:36 -07:00
parent fb62a95f57
commit a903b5d3c1
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
select2-latest.html
View File

@ -1625,6 +1625,20 @@ $("#select").select2({
</p>
</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="span12">
<h3>selected</h3>
@ -1633,7 +1647,7 @@ $("#select").select2({
<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 highlighted choice object</dd>
<dt>object</dt><dd>the choice object that was selected</dd>
</dl>
</p>
</div>

2
select2-master

@ -1 +1 @@
Subproject commit 2bf5a763c5e884cdf0295aa0d5072968bab941e2
Subproject commit dc27a5b74d78c1f04306caba576c27973311424b

32
select2-test.html
View File

@ -59,20 +59,7 @@
});
</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">
function movieFormatResult(movie) {
@ -127,5 +114,22 @@
});
});
</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>
</html>