Merge remote-tracking branch 'upstream/master'

Author: boyaq

README.md

@@ -24,6 +24,10 @@ Browser compatibility
 * Firefox 10+
 * Safari 3+
 * Opera 10.6+
+ 
+Usage
+-----
+You can source Select2 directly from a [CDN like JSDliver](http://www.jsdelivr.com/#!select2), [download it from this GitHub repo](https://github.com/ivaynberg/select2/tags), or use one of the integrations below.
 
 Integrations
 ------------
@@ -34,14 +38,25 @@ Integrations
 * [Django](https://github.com/applegrew/django-select2)
 * [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin)
 * [Symfony2](https://github.com/avocode/FormExtensions)
-* [Bootstrap](https://github.com/t0m/select2-bootstrap-css) (CSS skin)
-* [Yii](https://github.com/tonybolzan/yii-select2)
+* [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins)
+* [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/))
+* [Meteor](https://jquery-select2.meteor.com)
+* [Yii 2.x](http://demos.krajee.com/widgets#select2)
+* [Yii 1.x](https://github.com/tonybolzan/yii-select2)
+* [AtmosphereJS](https://atmospherejs.com/package/jquery-select2)
+
+### Example Integrations
+
+* [Knockout.js](https://github.com/ivaynberg/select2/wiki/Knockout.js-Integration)
+* [Socket.IO](https://github.com/ivaynberg/select2/wiki/Socket.IO-Integration)
+* [PHP](https://github.com/ivaynberg/select2/wiki/PHP-Example)
+* [.Net MVC] (https://github.com/ivaynberg/select2/wiki/.Net-MVC-Example)
 
 Internationalization (i18n)
 ---------------------------
 
-Select2 supports multiple languages by simply including the right
-language JS file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.).
+Select2 supports multiple languages by simply including the right language JS
+file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.) after `select2.js`.
 
 Missing a language? Just copy `select2_locale_en.js.template`, translate
 it, and make a pull request back to Select2 here on GitHub.

bower.json

@@ -1,6 +1,6 @@
 {
     "name": "select2",
-    "version": "3.4.6",
+    "version": "3.5.0",
     "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"],
     "dependencies": {
         "jquery": ">= 1.7.1"

component.json

@@ -2,7 +2,7 @@
   "name": "select2",
   "repo": "ivaynberg/select2",
   "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "version": "3.4.6",
+  "version": "3.5.0",
   "demo": "http://ivaynberg.github.io/select2/",
   "keywords": [
     "jquery"

composer.json

@@ -2,7 +2,7 @@
   "name":
   "ivaynberg/select2",
   "description": "Select2 is a jQuery based replacement for select boxes.",
-  "version": "3.4.6",
+  "version": "3.5.0",
   "type": "component",
   "homepage": "http://ivaynberg.github.io/select2/",
   "license": "Apache-2.0",

package.json

@@ -5,7 +5,7 @@
   "author": "Igor Vaynberg",
   "repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"},
   "main": "select2.js",
-  "version": "3.4.6",
+  "version": "3.5.0",
   "jspm": {
     "main": "select2",
     "files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"],

select2.css

@@ -56,6 +56,10 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background-image: linear-gradient(to top, #eee 0%, #fff 50%);
 }
 
+html[dir="rtl"] .select2-container .select2-choice {
+    padding: 0 8px 0 0;
+}
+
 .select2-container.select2-drop-above .select2-choice {
     border-bottom-color: #aaa;
 
@@ -84,6 +88,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     width: auto;
 }
 
+html[dir="rtl"] .select2-container .select2-choice > .select2-chosen {
+    margin-left: 26px;
+    margin-right: 0;
+}
+
 .select2-container .select2-choice abbr {
     display: none;
     width: 12px;
@@ -196,13 +205,26 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background-image: linear-gradient(to top, #ccc 0%, #eee 60%);
 }
 
+html[dir="rtl"] .select2-container .select2-choice .select2-arrow {
+    left: 0;
+    right: auto;
+
+    border-left: none;
+    border-right: 1px solid #aaa;
+    border-radius: 4px 0 0 4px;
+}
+
 .select2-container .select2-choice .select2-arrow b {
     display: block;
     width: 100%;
     height: 100%;
     background: url('select2.png') no-repeat 0 1px;
 }
 
+html[dir="rtl"] .select2-container .select2-choice .select2-arrow b {
+    background-position: 2px 1px;
+}
+
 .select2-search {
     display: inline-block;
     width: 100%;
@@ -241,6 +263,16 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     background: url('select2.png') no-repeat 100% -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
 }
 
+html[dir="rtl"] .select2-search input {
+    padding: 4px 5px 4px 20px;
+
+    background: #fff url('select2.png') no-repeat -37px -22px;
+    background: url('select2.png') no-repeat -37px -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, #fff), color-stop(0.99, #eee));
+    background: url('select2.png') no-repeat -37px -22px, -webkit-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat -37px -22px, -moz-linear-gradient(center bottom, #fff 85%, #eee 99%);
+    background: url('select2.png') no-repeat -37px -22px, linear-gradient(to bottom, #fff 85%, #eee 99%) 0 0;
+}
+
 .select2-drop.select2-drop-above .select2-search input {
     margin-top: 4px;
 }
@@ -295,10 +327,18 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     border-left: none;
     filter: none;
 }
+html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow {
+    border-right: none;
+}
+
 .select2-dropdown-open .select2-choice .select2-arrow b {
     background-position: -18px 1px;
 }
 
+html[dir="rtl"] .select2-dropdown-open .select2-choice .select2-arrow b {
+    background-position: -16px 1px;
+}
+
 .select2-hidden-accessible {
     border: 0;
     clip: rect(0 0 0 0);
@@ -321,6 +361,11 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
+html[dir="rtl"] .select2-results {
+    padding: 0 4px 0 0;
+    margin: 4px 0 4px 4px;
+}
+
 .select2-results ul.select2-result-sub {
     margin: 0;
     padding-left: 0;
@@ -350,15 +395,13 @@ Version: @@ver@@ Timestamp: @@timestamp@@
               user-select: none;
 }
 
-.select2-results-dept-0 .select2-result-label { padding-left: 20px }
-.select2-results-dept-1 .select2-result-label { padding-left: 40px }
-.select2-results-dept-2 .select2-result-label { padding-left: 60px }
-.select2-results-dept-3 .select2-result-label { padding-left: 80px }
-.select2-results-dept-4 .select2-result-label { padding-left: 100px }
-.select2-results-dept-5 .select2-result-label { padding-left: 110px }
-.select2-results-dept-6 .select2-result-label { padding-left: 120px }
-
-
+.select2-results-dept-1 .select2-result-label { padding-left: 20px }
+.select2-results-dept-2 .select2-result-label { padding-left: 40px }
+.select2-results-dept-3 .select2-result-label { padding-left: 60px }
+.select2-results-dept-4 .select2-result-label { padding-left: 80px }
+.select2-results-dept-5 .select2-result-label { padding-left: 100px }
+.select2-results-dept-6 .select2-result-label { padding-left: 110px }
+.select2-results-dept-7 .select2-result-label { padding-left: 120px }
 
 .select2-results .select2-highlighted {
     background: #3875d7;
@@ -379,9 +422,9 @@ Version: @@ver@@ Timestamp: @@timestamp@@
     color: #000;
 }
 
-
 .select2-results .select2-no-results,
 .select2-results .select2-searching,
+.select2-results .select2-ajax-error,
 .select2-results .select2-selection-limit {
     background: #f4f4f4;
     display: list-item;
@@ -411,6 +454,10 @@ disabled look for disabled choices in the results dropdown
     background: #f4f4f4 url('select2-spinner.gif') no-repeat 100%;
 }
 
+.select2-results .select2-ajax-error {
+    background: rgba(255, 50, 50, .2);
+}
+
 .select2-more-results {
     background: #f4f4f4;
     display: list-item;
@@ -442,7 +489,7 @@ disabled look for disabled choices in the results dropdown
     height: auto !important;
     height: 1%;
     margin: 0;
-    padding: 0;
+    padding: 0 5px 0 0;
     position: relative;
 
     border: 1px solid #aaa;
@@ -456,6 +503,10 @@ disabled look for disabled choices in the results dropdown
     background-image: linear-gradient(to bottom, #eee 1%, #fff 15%);
 }
 
+html[dir="rtl"] .select2-container-multi .select2-choices {
+    padding: 0 0 0 5px;
+}
+
 .select2-locked {
   padding: 3px 5px 3px 5px !important;
 }
@@ -539,8 +590,8 @@ html[dir="rtl"] .select2-container-multi .select2-choices li
 }
 html[dir="rtl"] .select2-container-multi .select2-choices .select2-search-choice
 {
-    margin-left: 0;
-    margin-right: 5px;
+    margin: 3px 5px 3px 0;
+    padding: 3px 18px 3px 5px;
 }
 .select2-container-multi .select2-choices .select2-search-choice .select2-chosen {
     cursor: default;
@@ -570,6 +621,11 @@ html[dir="rtl"] .select2-search-choice-close {
     left: 3px;
 }
 
+html[dir="rtl"] .select2-container-multi .select2-search-choice-close {
+    left: auto;
+    right: 2px;
+}
+
 .select2-container-multi .select2-choices .select2-search-choice .select2-search-choice-close:hover {
   background-position: right -11px;
 }

select2.jquery.json

@@ -11,7 +11,7 @@
         "tag",
         "tagging"
     ],
-    "version": "3.4.6",
+    "version": "3.5.0",
     "author": {
         "name": "Igor Vaynberg",
         "url": "https://github.com/ivaynberg"

select2.js

@@ -6,12 +6,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['ar'] = {
         formatNoMatches: function () { return "لم يتم العثور على مطابقات"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; if (n == 1){ return "الرجاء إدخال حرف واحد على الأكثر"; } return n == 2 ? "الرجاء إدخال حرفين على الأكثر" : "الرجاء إدخال " + n + " على الأكثر"; },
         formatInputTooLong: function (input, max) { var n = input.length - max; if (n == 1){ return "الرجاء إدخال حرف واحد على الأقل"; } return n == 2 ? "الرجاء إدخال حرفين على الأقل" : "الرجاء إدخال " + n + " على الأقل "; },
         formatSelectionTooBig: function (limit) { if (n == 1){ return "يمكنك أن تختار إختيار واحد فقط"; } return n == 2 ? "يمكنك أن تختار إختيارين فقط" : "يمكنك أن تختار " + n + " إختيارات فقط"; },
         formatLoadMore: function (pageNumber) { return "تحميل المزيد من النتائج…"; },
         formatSearching: function () { return "البحث…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['ar']);
 })(jQuery);

select2_locale_ar.js

@@ -0,0 +1,18 @@
+/**
+ * Select2 Azerbaijani translation.
+ *
+ * Author: Farhad Safarov <farhad.safarov@gmail.com>
+ */
+(function ($) {
+    "use strict";
+
+    $.extend($.fn.select2.defaults, {
+        formatMatches: function (matches) { return matches + " nəticə mövcuddur, hərəkət etdirmək üçün yuxarı və aşağı düymələrindən istifadə edin."; },
+        formatNoMatches: function () { return "Nəticə tapılmadı"; },
+        formatInputTooShort: function (input, min) { var n = min - input.length; return n + " simvol daxil edin"; },
+        formatInputTooLong: function (input, max) { var n = input.length - max; return n + " simvol silin"; },
+        formatSelectionTooBig: function (limit) { return "Sadəcə " + limit + " element seçə bilərsiniz"; },
+        formatLoadMore: function (pageNumber) { return "Daha çox nəticə yüklənir…"; },
+        formatSearching: function () { return "Axtarılır…"; }
+    });
+})(jQuery);