diff --git a/_layouts/main.html b/_layouts/main.html index dda25744..3a18feb7 100755 --- a/_layouts/main.html +++ b/_layouts/main.html @@ -1,5 +1,5 @@ - + {{ page.title }} @@ -142,7 +142,7 @@
diff --git a/select2-latest.html b/select2-latest.html index 8a9a968e..07ede0fc 100644 --- a/select2-latest.html +++ b/select2-latest.html @@ -37,7 +37,8 @@ function format(state) { } $("#e4").select2({ formatResult: format, - formatSelection: format + formatSelection: format, + escapeMarkup: function(m) { return m; } }); }); @@ -106,7 +107,8 @@ $("#e6").select2({ }, formatResult: movieFormatResult, // omitted for brevity, see the source of this page formatSelection: movieFormatSelection, // omitted for brevity, see the source of this page - dropdownCssClass: "bigdrop" // apply css that makes the dropdown taller + dropdownCssClass: "bigdrop", // apply css that makes the dropdown taller + escapeMarkup: function (m) { return m; } // we do not want to escape markup since we are displaying html in results }); }); @@ -137,7 +139,8 @@ $("#e7").select2({ }, formatResult: movieFormatResult, // omitted for brevity, see the source of this page formatSelection: movieFormatSelection, // omitted for brevity, see the source of this page - dropdownCssClass: "bigdrop" // apply css that makes the dropdown taller + dropdownCssClass: "bigdrop", // apply css that makes the dropdown taller + escapeMarkup: function (m) { return m; } // we do not want to escape markup since we are displaying html in results }); }); @@ -997,7 +1000,7 @@ $(document).ready(function () {

Only applies to single-value select boxes

- maximumSelectionSizeint + maximumSelectionSizeint/function

The maximum number of items that can be selected in a multi-select control. If this number is less than 1 selection is not limited.

diff --git a/select2-master b/select2-master index 8332d6a7..e78dc69a 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit 8332d6a7e9bf61be710acad6b7bea32e540db105 +Subproject commit e78dc69a6b8dcadf8c8919b039d7ad0b4e7a6970 diff --git a/select2-test.html b/select2-test.html new file mode 100644 index 00000000..e100390d --- /dev/null +++ b/select2-test.html @@ -0,0 +1,37 @@ + + + + + + + + + + +
+
+
+ + + + + \ No newline at end of file