select2-rails 3.5.9 → 3.5.9.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmJhNDhmYTI5M2VkYWU4YWQwOTY2MDEzMmFiMDMyN2I0OWNkZTQyMA==
-  data.tar.gz: !binary |-
-    MDkzMzY0MWIwZDIyODM1M2I3ZWRlZWE0ZTdhYjJmYzY4NDE1MWEwNg==
+SHA1:
+  metadata.gz: f905192c7ef87ad156560a77960c975629d45bd1
+  data.tar.gz: 78f225b8fd3081ddea3c5d228f4d1d54dfff874d
 SHA512:
-  metadata.gz: !binary |-
-    Y2UyZWE5YzQ4MTYyMDY5YTczZDNmZGNhOTc5Y2U4Mjg1MTM3YzdjM2QyMzNl
-    NDRiYjU2YmE0NWNjYzE4NTY2MTdlNTIwZGQyZjUzZTNkODBkNjYzNDUwYmM5
-    OTM3NjYxNGY1MDEwZTA1MTc0YWI0YWY1YzZlM2RhNzkwOGI3MWU=
-  data.tar.gz: !binary |-
-    NzM5OTVhZTU5YmI5MTQyZWNlNGFjYjhkZDM4MmMxOGQ4MmI5Y2VlMTJlMDg2
-    MzdhNTNhZTk3MmUyZDVhYjY2ZGZmZjAxYzRmMjQwODEzNWQ1MDQzZWM3M2U5
-    NWVlOTZkNWJkN2E5MmZlYjQ0Nzg1NjFiYzg5OWM0NTAwNjk1OTQ=
+  metadata.gz: d4059e2a9461fe63a12ae4e9d406d02b3e4f98c5e0a3498596f99b4f0649d3a8a48d32a2e0572e8f5a799e3d07bf15353a8ff43ed219b9b34476270d759fdfc9
+  data.tar.gz: 1b7e800c6eed3d3f3b34c6281cfc485196dfa1603e22f47dbb7e60a498fb68a54f9374850264671722419d5cca16f3b56c2a7c9f68aecf9dd0801486e74979b6

data/lib/select2-rails/engine.rb

@@ -1,6 +1,10 @@
 module Select2
   module Rails
     class Engine < ::Rails::Engine
+      initializer :images do |app|
+        app.config.assets.precompile +=
+          %w(select2.png select2-spinner.gif select2x2.png)
+      end
     end
   end
-end
+end

data/lib/select2-rails/source_file.rb

@@ -9,12 +9,12 @@ class SourceFile < Thor
   def fetch
     filtered_tags = fetch_tags
     tag = select("Which tag do you want to fetch?", filtered_tags)
-    self.destination_root = "app/assets"
+    self.destination_root = "vendor/assets"
     remote = "https://github.com/ivaynberg/select2"
     get "#{remote}/raw/#{tag}/select2.png", "images/select2.png"
     get "#{remote}/raw/#{tag}/select2x2.png", "images/select2x2.png"
     get "#{remote}/raw/#{tag}/select2-spinner.gif", "images/select2-spinner.gif"
-    get "#{remote}/raw/#{tag}/select2.css", "stylesheets/select2.css"
+    get "#{remote}/raw/#{tag}/select2.css", "stylesheets/select2.scss"
     get "#{remote}/raw/#{tag}/select2-bootstrap.css", "stylesheets/select2-bootstrap.css"
     get "#{remote}/raw/#{tag}/select2.js", "javascripts/select2.js"
     languages.each do |lang|
@@ -22,22 +22,14 @@ class SourceFile < Thor
     end
   end
 
-  desc "convert css to css.erb file", "make css preprocess with erb"
+  desc "convert css to use rails paths", "make css use rails paths"
   def convert
-    self.destination_root = "app/assets"
+    self.destination_root = "vendor/assets"
     inside destination_root do
-      run("cp stylesheets/select2.css stylesheets/select2.css.erb")
-      build_image_dependencies
-      gsub_file 'stylesheets/select2.css.erb', %r/url\(([^\)]*)\)/, 'url(<%= asset_path(\1) %>)'
+      gsub_file 'stylesheets/select2.scss', %r/url\(([^\)]*)\)/, 'image-url(\1)'
     end
   end
 
-  desc "clean up useless files", "clean up useless files"
-  def cleanup
-    self.destination_root = "app/assets"
-    remove_file "stylesheets/select2.css"
-  end
-  
   private
 
   def fetch_tags
@@ -45,12 +37,14 @@ class SourceFile < Thor
     response = JSON.parse(http.get("https://api.github.com/repos/ivaynberg/select2/tags").body)
     response.map{|tag| tag["name"]}.sort
   end
+
   def languages
     [ "ar", "bg", "ca", "cs", "da", "de", "el", "es", "et", "eu", "fa", "fi", "fr", "gl", "he", "hr",
       "hu", "id", "is", "it", "ja", "ka", "ko", "lt", "lv", "mk", "ms", "nl", "no", "pl", "pt-BR",
       "pt-PT", "ro", "rs", "ru", "sk", "sv", "th", "tr", "uk", "vi", "zh-CN", "zh-TW"
     ].sort
   end
+
   def select msg, elements
     elements.each_with_index do |element, index|
       say(block_given? ? yield(element, index + 1) : ("#{index + 1}. #{element.to_s}"))
@@ -59,18 +53,4 @@ class SourceFile < Thor
     elements[result - 1]
   end
 
-  def build_image_dependencies
-    f = File.open("stylesheets/select2.css.erb", "r+")
-    lines = f.readlines
-    f.close
-    lines = ["//= depend_on_asset \"select2.png\"\n"] + 
-            ["//= depend_on_asset \"select2-spinner.gif\"\n"] + 
-            ["//= depend_on_asset \"select2x2.png\"\n"] + 
-            lines
-
-    output = File.new("stylesheets/select2.css.erb", "w")
-    lines.each { |line| output.write line }
-    output.close
-  end
-
 end

data/lib/select2-rails/version.rb

@@ -1,5 +1,5 @@
 module Select2
   module Rails
-    VERSION = "3.5.9"
+    VERSION = "3.5.9.1"
   end
 end

data/{app → vendor}/assets/javascripts/select2.js

@@ -1,7 +1,7 @@
 /*
 Copyright 2012 Igor Vaynberg
 
-Version: 3.5.0 Timestamp: Mon Jun 16 19:29:44 EDT 2014
+Version: 3.5.1
 
 This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
 General Public License version 2 (the "GPL License"). You may choose either license to govern your
@@ -443,6 +443,16 @@ the specific language governing permissions and limitations under the Apache Lic
                         // TODO - replace query.page with query so users have access to term, page, etc.
                         // added query as third paramter to keep backwards compatibility
                         var results = options.results(data, query.page, query);
+                        query.callback(results);
+                    },
+                    error: function(jqXHR, textStatus, errorThrown){
+                        var results = {
+                            hasError: true,
+                            jqXHR: jqXHR,
+                            textStatus: textStatus,
+                            errorThrown: errorThrown,
+                        };
+
                         query.callback(results);
                     }
                 });
@@ -836,13 +846,13 @@ the specific language governing permissions and limitations under the Apache Lic
 
         // abstract
         destroy: function () {
-            var element=this.opts.element, select2 = element.data("select2");
+            var element=this.opts.element, select2 = element.data("select2"), self = this;
 
             this.close();
 
             if (element.length && element[0].detachEvent) {
                 element.each(function () {
-                    this.detachEvent("onpropertychange", this._sync);
+                    this.detachEvent("onpropertychange", self._sync);
                 });
             }
             if (this.propertyObserver) {
@@ -1027,7 +1037,7 @@ the specific language governing permissions and limitations under the Apache Lic
 
                     query.callback(data);
                 });
-                // this is needed because inside val() we construct choices from options and there id is hardcoded
+                // this is needed because inside val() we construct choices from options and their id is hardcoded
                 opts.id=function(e) { return e.id; };
             } else {
                 if (!("query" in opts)) {
@@ -1766,6 +1776,12 @@ the specific language governing permissions and limitations under the Apache Lic
                     return;
                 }
 
+                // handle ajax error
+                if(data.hasError !== undefined && checkFormatter(opts.formatAjaxError, "formatAjaxError")) {
+                    render("<li class='select2-ajax-error'>" + evaluate(opts.formatAjaxError, opts.element, data.jqXHR, data.textStatus, data.errorThrown) + "</li>");
+                    return;
+                }
+
                 // save context, if any
                 this.context = (data.context===undefined) ? null : data.context;
                 // create a default choice and prepend it to the list
@@ -2101,6 +2117,9 @@ the specific language governing permissions and limitations under the Apache Lic
             this.search.on("keydown", this.bind(function (e) {
                 if (!this.isInterfaceEnabled()) return;
 
+                // filter 229 keyCodes (input method editor is processing key input)
+                if (229 == e.keyCode) return;
+
                 if (e.which === KEY.PAGE_UP || e.which === KEY.PAGE_DOWN) {
                     // prevent the page from scrolling
                     killEvent(e);
@@ -2953,7 +2972,7 @@ the specific language governing permissions and limitations under the Apache Lic
         // multi
         onSelect: function (data, options) {
 
-            if (!this.triggerSelect(data)) { return; }
+            if (!this.triggerSelect(data) || data.text === "") { return; }
 
             this.addSelectedChoice(data);
 
@@ -3406,13 +3425,6 @@ the specific language governing permissions and limitations under the Apache Lic
         },
         formatResultCssClass: function(data) {return data.css;},
         formatSelectionCssClass: function(data, container) {return undefined;},
-        formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; },
-        formatNoMatches: function () { return "No matches found"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1? "" : "s"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1? "" : "s"); },
-        formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Loading more results…"; },
-        formatSearching: function () { return "Searching…"; },
         minimumResultsForSearch: 0,
         minimumInputLength: 0,
         maximumInputLength: null,
@@ -3451,6 +3463,21 @@ the specific language governing permissions and limitations under the Apache Lic
         }
     };
 
+    $.fn.select2.locales = [];
+
+    $.fn.select2.locales['en'] = {
+         formatMatches: function (matches) { if (matches === 1) { return "One result is available, press enter to select it."; } return matches + " results are available, use up and down arrow keys to navigate."; },
+         formatNoMatches: function () { return "No matches found"; },
+         formatAjaxError: function (jqXHR, textStatus, errorThrown) { return "Loading failed"; },
+         formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " or more character" + (n == 1 ? "" : "s"); },
+         formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); },
+         formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
+         formatLoadMore: function (pageNumber) { return "Loading more results…"; },
+         formatSearching: function () { return "Searching…"; },
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['en']);
+
     $.fn.select2.ajaxDefaults = {
         transport: $.ajax,
         params: {

data/{app → vendor}/assets/javascripts/select2_locale_ar.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);

data/{app → vendor}/assets/javascripts/select2_locale_az.js

@@ -6,7 +6,7 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+     $.fn.select2.locales['az'] = {
         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"; },
@@ -14,5 +14,7 @@
         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…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['az']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_bg.js

@@ -7,12 +7,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['bg'] = {
         formatNoMatches: function () { return "Няма намерени съвпадения"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Моля въведете още " + n + " символ" + (n > 1 ? "а" : ""); },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Моля въведете с " + n + " по-малко символ" + (n > 1 ? "а" : ""); },
         formatSelectionTooBig: function (limit) { return "Можете да направите до " + limit + (limit > 1 ? " избора" : " избор"); },
         formatLoadMore: function (pageNumber) { return "Зареждат се още…"; },
         formatSearching: function () { return "Търсене…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['bg']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_ca.js

@@ -6,12 +6,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['ca'] = {
         formatNoMatches: function () { return "No s'ha trobat cap coincidència"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduïu " + n + " caràcter" + (n == 1 ? "" : "s") + " més"; },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Introduïu " + n + " caràcter" + (n == 1? "" : "s") + "menys"; },
         formatSelectionTooBig: function (limit) { return "Només podeu seleccionar " + limit + " element" + (limit == 1 ? "" : "s"); },
         formatLoadMore: function (pageNumber) { return "S'estan carregant més resultats…"; },
         formatSearching: function () { return "S'està cercant…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['ca']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_cs.js

@@ -12,7 +12,7 @@
         3: function() { return "tři"; },
         4: function() { return "čtyři"; }
     }
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['cs'] = {
         formatNoMatches: function () { return "Nenalezeny žádné položky"; },
         formatInputTooShort: function (input, min) {
             var n = min - input.length;
@@ -45,5 +45,7 @@
         },
         formatLoadMore: function (pageNumber) { return "Načítají se další výsledky…"; },
         formatSearching: function () { return "Vyhledávání…"; }
-    });
+    };
+
+	$.extend($.fn.select2.defaults, $.fn.select2.locales['cs']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_da.js

@@ -6,12 +6,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['da'] = {
         formatNoMatches: function () { return "Ingen resultater fundet"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Angiv venligst " + n + " tegn mere"; },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Angiv venligst " + n + " tegn mindre"; },
         formatSelectionTooBig: function (limit) { return "Du kan kun vælge " + limit + " emne" + (limit === 1 ? "" : "r"); },
         formatLoadMore: function (pageNumber) { return "Indlæser flere resultater…"; },
         formatSearching: function () { return "Søger…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['da']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_de.js

@@ -4,7 +4,7 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['de'] = {
         formatNoMatches: function () { return "Keine Übereinstimmungen gefunden"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Bitte " + n + " Zeichen mehr eingeben"; },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; },
@@ -12,5 +12,7 @@
         formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; },
         formatSearching: function () { return "Suche…"; },
         formatMatches: function (matches) { return matches + " Ergebnis " + (matches > 1 ? "se" : "") + " verfügbar, zum Navigieren die Hoch-/Runter-Pfeiltasten verwenden."; }
-    });
-})(jQuery);
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['de']);
+})(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_el.js

@@ -6,12 +6,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['el'] = {
         formatNoMatches: function () { return "Δεν βρέθηκαν αποτελέσματα"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Παρακαλούμε εισάγετε " + n + " περισσότερο" + (n > 1 ? "υς" : "") + " χαρακτήρ" + (n > 1 ? "ες" : "α"); },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Παρακαλούμε διαγράψτε " + n + " χαρακτήρ" + (n > 1 ? "ες" : "α"); },
         formatSelectionTooBig: function (limit) { return "Μπορείτε να επιλέξετε μόνο " + limit + " αντικείμεν" + (limit > 1 ? "α" : "ο"); },
         formatLoadMore: function (pageNumber) { return "Φόρτωση περισσότερων…"; },
         formatSearching: function () { return "Αναζήτηση…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['el']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_es.js

@@ -4,12 +4,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['es'] = {
         formatNoMatches: function () { return "No se encontraron resultados"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Por favor, introduzca " + n + " car" + (n == 1? "ácter" : "acteres"); },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Por favor, elimine " + n + " car" + (n == 1? "ácter" : "acteres"); },
         formatSelectionTooBig: function (limit) { return "Sólo puede seleccionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
         formatLoadMore: function (pageNumber) { return "Cargando más resultados…"; },
         formatSearching: function () { return "Buscando…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['es']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_et.js

@@ -6,12 +6,14 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['et'] = {
         formatNoMatches: function () { return "Tulemused puuduvad"; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "Sisesta " + n + " täht" + (n == 1 ? "" : "e") + " rohkem"; },
         formatInputTooLong: function (input, max) { var n = input.length - max; return "Sisesta " + n + " täht" + (n == 1? "" : "e") + " vähem"; },
         formatSelectionTooBig: function (limit) { return "Saad vaid " + limit + " tulemus" + (limit == 1 ? "e" : "t") + " valida"; },
         formatLoadMore: function (pageNumber) { return "Laen tulemusi.."; },
         formatSearching: function () { return "Otsin.."; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['et']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_eu.js

@@ -6,7 +6,7 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['eu'] = {
         formatNoMatches: function () {
           return "Ez da bat datorrenik aurkitu";
         },
@@ -39,5 +39,7 @@
         formatSearching: function () {
           return "Bilatzen…";
         }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['eu']);
 })(jQuery);

data/{app → vendor}/assets/javascripts/select2_locale_fa.js

@@ -7,7 +7,7 @@
 (function ($) {
     "use strict";
 
-    $.extend($.fn.select2.defaults, {
+    $.fn.select2.locales['fa'] = {
         formatMatches: function (matches) { return matches + " نتیجه موجود است، کلیدهای جهت بالا و پایین را برای گشتن استفاده کنید."; },
         formatNoMatches: function () { return "نتیجه‌ای یافت نشد."; },
         formatInputTooShort: function (input, min) { var n = min - input.length; return "لطفاً " + n + " نویسه بیشتر وارد نمایید"; },
@@ -15,5 +15,7 @@
         formatSelectionTooBig: function (limit) { return "شما فقط می‌توانید " + limit + " مورد را انتخاب کنید"; },
         formatLoadMore: function (pageNumber) { return "در حال بارگیری موارد بیشتر…"; },
         formatSearching: function () { return "در حال جستجو…"; }
-    });
+    };
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['fa']);
 })(jQuery);