1
0
mirror of synced 2024-11-26 14:56:07 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2013-05-06 09:40:33 -07:00
parent 0da89840ed
commit fe6a8a8d46
2 changed files with 2 additions and 2 deletions

View File

@ -592,7 +592,7 @@ $("#e8").select2();
$("#e8_get").click(function () { alert("Selected value is: "+$("#e8").select2("val"));}); $("#e8_get").click(function () { alert("Selected value is: "+$("#e8").select2("val"));});
$("#e8_set").click(function () { $("#e8").select2("val", "CA"); }); $("#e8_set").click(function () { $("#e8").select2("val", "CA"); });
$("#e8_cl").click(function() { $("#e8").select2("val", ""); }); $("#e8_cl").click(function() { $("#e8").select2("val", ""); });
$("#e8_get2").click(function () { alert("Selected data is: "+JSON.stringify($("#e8").select2("data")));}); $("#e8_get2").click(function () { var data = $("#e8").select2("data"); delete data.element; alert("Selected data is: "+JSON.stringify(data));});
$("#e8_set2").click(function () { $("#e8").select2("data", {id: "CA", text: "California"}); }); $("#e8_set2").click(function () { $("#e8").select2("data", {id: "CA", text: "California"}); });
$("#e8_open").click(function () { $("#e8").select2("open"); }); $("#e8_open").click(function () { $("#e8").select2("open"); });
$("#e8_close").click(function () { $("#e8").select2("close"); }); $("#e8_close").click(function () { $("#e8").select2("close"); });

@ -1 +1 @@
Subproject commit 5a9905bfa7ea1185b30a6612732ca5964f3f870e Subproject commit 83050fd2fa4d31732f293d6e6c88ea7eb30378cc