bootbox-rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912eed7e639d4f8df1cef4331fe3502bdff72186
-  data.tar.gz: 5f4915721bf0d9da6e6015a72af7945bd236ea59
+  metadata.gz: e4db0c69cc34403930e43aecad3b986131cf50ad
+  data.tar.gz: 8c955e6699da555174afb01d486419b583d02078
 SHA512:
-  metadata.gz: af33cad6e23d813b7bf5d693e378a8313c952237d5173824d4077ca124afce3c8be3b0a9792cd49f505e0fcc7e78ef775a227c8773b59788fdb6f88981713d10
-  data.tar.gz: 8b1ca6389c948b7cbe911ea0f7c8190f5f19cfe06d7102242adc07d4a6e9d0248834051cfb48fb2000e9669f437e7c75bab5baf7dac5fda1ce8731eac06e8bf1
+  metadata.gz: 9c0e132afdb8cb2768d224f53d52d7b133171b3370f160f0a34221dba4de2b3f4a806f8fc549f5641f749d203a78155f53a4af7908e904bec7f441e6cc557371
+  data.tar.gz: 7929a1b72a91871c4d173a4e4a78476d6594a903fbb477b060746d640f72910eb1c3e29dbfb76535f323d0b4769234cd2d77021e32e13c2082b667488016735f

data/vendor/assets/javascripts/bootbox.js

@@ -71,8 +71,8 @@
   var defaults = {
     // default language
     locale: "en",
-    // show backdrop or not
-    backdrop: true,
+    // show backdrop or not. Default to static so user has to interact with dialog
+    backdrop: "static",
     // animate the modal in/out
     animate: true,
     // additional class string applied to the top level dialog
@@ -105,7 +105,7 @@
 
     // so, if the callback can be invoked and it *explicitly returns false*
     // then we'll set a flag to keep the dialog active...
-    var preserveDialog = $.isFunction(callback) && callback(e) === false;
+    var preserveDialog = $.isFunction(callback) && callback.call(dialog, e) === false;
 
     // ... otherwise we'll bin it
     if (!preserveDialog) {
@@ -148,11 +148,6 @@
       options.buttons = {};
     }
 
-    // we only support Bootstrap's "static" and false backdrop args
-    // supporting true would mean you could dismiss the dialog without
-    // explicitly interacting with it
-    options.backdrop = options.backdrop ? "static" : false;
-
     buttons = options.buttons;
 
     total = getKeyLength(buttons);
@@ -312,7 +307,7 @@
      */
     options.buttons.ok.callback = options.onEscape = function() {
       if ($.isFunction(options.callback)) {
-        return options.callback();
+        return options.callback.call(this);
       }
       return true;
     };
@@ -329,11 +324,11 @@
      * overrides; undo anything the user tried to set they shouldn't have
      */
     options.buttons.cancel.callback = options.onEscape = function() {
-      return options.callback(false);
+      return options.callback.call(this, false);
     };
 
     options.buttons.confirm.callback = function() {
-      return options.callback(true);
+      return options.callback.call(this, true);
     };
 
     // confirm specific validation
@@ -381,21 +376,13 @@
     // it, but we need to make sure we respect a preference not to show it
     shouldShow = (options.show === undefined) ? true : options.show;
 
-    // check if the browser supports the option.inputType
-    var html5inputs = ["date","time","number"];
-    var i = document.createElement("input");
-    i.setAttribute("type", options.inputType);
-    if(html5inputs[options.inputType]){
-      options.inputType = i.type;
-    }
-
     /**
      * overrides; undo anything the user tried to set they shouldn't have
      */
     options.message = form;
 
     options.buttons.cancel.callback = options.onEscape = function() {
-      return options.callback(null);
+      return options.callback.call(this, null);
     };
 
     options.buttons.confirm.callback = function() {
@@ -426,7 +413,7 @@
           break;
       }
 
-      return options.callback(value);
+      return options.callback.call(this, value);
     };
 
     options.show = false;
@@ -462,6 +449,10 @@
         var groups = {};
         inputOptions = options.inputOptions || [];
 
+        if (!$.isArray(inputOptions)) {
+          throw new Error("Please pass an array of input options");
+        }
+
         if (!inputOptions.length) {
           throw new Error("prompt with select requires options");
         }
@@ -475,7 +466,6 @@
             throw new Error("given options in wrong format");
           }
 
-
           // ... but override that element if this option sits in a group
 
           if (option.group) {
@@ -533,14 +523,20 @@
         break;
     }
 
+    // @TODO provide an attributes option instead
+    // and simply map that as keys: vals
     if (options.placeholder) {
       input.attr("placeholder", options.placeholder);
     }
 
-    if(options.pattern){
+    if (options.pattern) {
       input.attr("pattern", options.pattern);
     }
 
+    if (options.maxlength) {
+      input.attr("maxlength", options.maxlength);
+    }
+
     // now place it in our form
     form.append(input);
 
@@ -560,6 +556,8 @@
 
     // ...and replace it with one focusing our input, if possible
     dialog.on("shown.bs.modal", function() {
+      // need the closure here since input isn't
+      // an object otherwise
       input.focus();
     });
 
@@ -582,6 +580,14 @@
       onEscape: options.onEscape
     };
 
+    if ($.fn.modal === undefined) {
+      throw new Error(
+        "$.fn.modal is not defined; please double check you have included " +
+        "the Bootstrap JavaScript library. See http://getbootstrap.com/javascript/ " +
+        "for more details."
+      );
+    }
+
     each(buttons, function(key, button) {
 
       // @TODO I don't like this string appending to itself; bit dirty. Needs reworking
@@ -603,9 +609,7 @@
 
     if (options.size === "large") {
       innerDialog.addClass("modal-lg");
-    }
-
-    if (options.size === "small") {
+    } else if (options.size === "small") {
       innerDialog.addClass("modal-sm");
     }
 
@@ -669,6 +673,30 @@
      * respective triggers
      */
 
+    if (options.backdrop !== "static") {
+      // A boolean true/false according to the Bootstrap docs
+      // should show a dialog the user can dismiss by clicking on
+      // the background.
+      // We always only ever pass static/false to the actual
+      // $.modal function because with `true` we can't trap
+      // this event (the .modal-backdrop swallows it)
+      // However, we still want to sort of respect true
+      // and invoke the escape mechanism instead
+      dialog.on("click.dismiss.bs.modal", function(e) {
+        // @NOTE: the target varies in >= 3.3.x releases since the modal backdrop
+        // moved *inside* the outer dialog rather than *alongside* it
+        if (dialog.children(".modal-backdrop").length) {
+          e.currentTarget = dialog.children(".modal-backdrop").get(0);
+        }
+
+        if (e.target !== e.currentTarget) {
+          return;
+        }
+
+        dialog.trigger("escape.close.bb");
+      });
+    }
+
     dialog.on("escape.close.bb", function(e) {
       if (callbacks.onEscape) {
         processCallback(e, dialog, callbacks.onEscape);
@@ -684,7 +712,6 @@
       var callbackKey = $(this).data("bb-handler");
 
       processCallback(e, dialog, callbacks[callbackKey]);
-
     });
 
     dialog.on("click", ".bootbox-close-button", function(e) {
@@ -708,7 +735,7 @@
     $(options.container).append(dialog);
 
     dialog.modal({
-      backdrop: options.backdrop,
+      backdrop: options.backdrop ? "static": false,
       keyboard: false,
       show: false
     });
@@ -757,6 +784,8 @@
 
   exports.hideAll = function() {
     $(".bootbox").modal("hide");
+
+    return exports;
   };
 
 
@@ -765,11 +794,26 @@
    * unlikely to be required. If this gets too large it can be split out into separate JS files.
    */
   var locales = {
+    ar : {
+      OK      : "موافق",
+      CANCEL  : "الغاء",
+      CONFIRM : "تأكيد"
+    },
+    bg_BG : {
+      OK      : "Ок",
+      CANCEL  : "Отказ",
+      CONFIRM : "Потвърждавам"
+    },
     br : {
       OK      : "OK",
       CANCEL  : "Cancelar",
       CONFIRM : "Sim"
     },
+    cs : {
+      OK      : "OK",
+      CANCEL  : "Zrušit",
+      CONFIRM : "Potvrdit"
+    },
     da : {
       OK      : "OK",
       CANCEL  : "Annuller",
@@ -795,6 +839,16 @@
       CANCEL  : "Cancelar",
       CONFIRM : "Aceptar"
     },
+    et : {
+      OK      : "OK",
+      CANCEL  : "Katkesta",
+      CONFIRM : "OK"
+    },
+    fa : {
+      OK      : "قبول",
+      CANCEL  : "لغو",
+      CONFIRM : "تایید"
+    },
     fi : {
       OK      : "OK",
       CANCEL  : "Peruuta",
@@ -810,11 +864,31 @@
       CANCEL  : "ביטול",
       CONFIRM : "אישור"
     },
+    hu : {
+      OK      : "OK",
+      CANCEL  : "Mégsem",
+      CONFIRM : "Megerősít"
+    },
+    hr : {
+      OK      : "OK",
+      CANCEL  : "Odustani",
+      CONFIRM : "Potvrdi"
+    },
+    id : {
+      OK      : "OK",
+      CANCEL  : "Batal",
+      CONFIRM : "OK"
+    },
     it : {
       OK      : "OK",
       CANCEL  : "Annulla",
       CONFIRM : "Conferma"
     },
+    ja : {
+      OK      : "OK",
+      CANCEL  : "キャンセル",
+      CONFIRM : "確認"
+    },
     lt : {
       OK      : "Gerai",
       CANCEL  : "Atšaukti",
@@ -840,16 +914,31 @@
       CANCEL  : "Anuluj",
       CONFIRM : "Potwierdź"
     },
+    pt : {
+      OK      : "OK",
+      CANCEL  : "Cancelar",
+      CONFIRM : "Confirmar"
+    },
     ru : {
       OK      : "OK",
       CANCEL  : "Отмена",
       CONFIRM : "Применить"
     },
+    sq : {
+      OK : "OK",
+      CANCEL : "Anulo",
+      CONFIRM : "Prano"
+    },
     sv : {
       OK      : "OK",
       CANCEL  : "Avbryt",
       CONFIRM : "OK"
     },
+    th : {
+      OK      : "ตกลง",
+      CANCEL  : "ยกเลิก",
+      CONFIRM : "ยืนยัน"
+    },
     tr : {
       OK      : "Tamam",
       CANCEL  : "İptal",
@@ -867,6 +956,32 @@
     }
   };
 
+  exports.addLocale = function(name, values) {
+    $.each(["OK", "CANCEL", "CONFIRM"], function(_, v) {
+      if (!values[v]) {
+        throw new Error("Please supply a translation for '" + v + "'");
+      }
+    });
+
+    locales[name] = {
+      OK: values.OK,
+      CANCEL: values.CANCEL,
+      CONFIRM: values.CONFIRM
+    };
+
+    return exports;
+  };
+
+  exports.removeLocale = function(name) {
+    delete locales[name];
+
+    return exports;
+  };
+
+  exports.setLocale = function(name) {
+    return exports.setDefaults("locale", name);
+  };
+
   exports.init = function(_$) {
     return init(_$ || $);
   };

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootbox-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Kozloff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler