From db6a8e2d20615f5120e34a4d84acbfeddcbe4b67 Mon Sep 17 00:00:00 2001 From: Arnold Daniels Date: Thu, 27 Dec 2012 22:41:43 +0100 Subject: [PATCH 1/3] Fixed travis ci img --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca80b4aa..280cbf71 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Jasny Bootstrap v2.2.2-j3](http://jasny.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/jasny/bootstrap.png)](http://travis-ci.org/jansy/bootstrap) +# [Jasny Bootstrap v2.2.2-j3](http://jasny.github.com/bootstrap) [![Build Status](https://travis-ci.org/jasny/bootstrap.png?branch=master)](https://travis-ci.org/jasny/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). From 9565f1703a7ce9d64b906b8450e51e8670548ef2 Mon Sep 17 00:00:00 2001 From: Arnold Daniels Date: Fri, 28 Dec 2012 22:56:15 +0100 Subject: [PATCH 2/3] Improved docs for v2.2.2-j3 --- docs/assets/js/bootstrap.js | 6 +++--- docs/index.html | 22 +++++++++++++++++++--- docs/javascript.html | 8 ++++++-- docs/templates/pages/index.mustache | 22 +++++++++++++++++++--- docs/templates/pages/javascript.mustache | 8 ++++++-- 5 files changed, 53 insertions(+), 13 deletions(-) diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 6c9c9ba6..e58f537d 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -2682,7 +2682,7 @@ "use strict"; // jshint ;_ - /* INPUTMASK PUBLIC CLASS DEFINITION + /* FILEUPLOAD PUBLIC CLASS DEFINITION * ================================= */ var Fileupload = function (element, options) { @@ -2796,7 +2796,7 @@ } - /* INPUTMASK PLUGIN DEFINITION + /* FILEUPLOAD PLUGIN DEFINITION * =========================== */ $.fn.fileupload = function (options) { @@ -2811,7 +2811,7 @@ $.fn.fileupload.Constructor = Fileupload - /* INPUTMASK DATA-API + /* FILEUPLOAD DATA-API * ================== */ $(function () { diff --git a/docs/index.html b/docs/index.html index a32766f7..944cc5b2 100644 --- a/docs/index.html +++ b/docs/index.html @@ -139,9 +139,9 @@

How can a fantastic library become any better? Check it out.

-

Action links

-

Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.

-

Action links look distinctly different than normal links.

+

Typeahead

+

With the improved typeahead, it's easy to fetch the data using AJAX.

+

It support key/value pairs (objects) next to normal arrays. Also you can convert a <select> to a typeahead.

Input mask

@@ -179,6 +179,11 @@
+
+

Action links

+

Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.

+

Action links look distinctly different than normal links.

+

Form elements

Go beyond uneditable input and create a full uneditable form, with disabled and uneditable elements.

@@ -193,6 +198,17 @@

Tabbable

Tabs work better than ever. You now have a bordered tabbable available. Also, a container can be turned into a tabbable.

+
+
+
+

Customize

+

Each customized bootstrap.zip contains a `custom.json` file, which can be used to use the same packages and variables when upgrading.

+

Automatically includes the CSS for jQuery plugins.

+
+
+

Download js plugins

+

Download a jQuery plugin directly from the javascript docs, including required CSS.

+

More

    diff --git a/docs/javascript.html b/docs/javascript.html index be923725..176df793 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1760,7 +1760,11 @@ $('.carousel').carousel({ source array, object, string, function [ ] - The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) or a function. The function is passed two arguments, the query value in the input field and the process callback. The function may be used synchronously by returning the data source directly or asynchronously via the process callback's single argument. + +

    The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) to get the data using AJAX or a function.

    +

    When using AJAX, the server should output a valid JSON array or key/value pair object.

    +

    The function is passed two arguments, the query value in the input field and the process callback. The function may be used synchronously by returning the data source directly or asynchronously via the process callback's single argument.

    + items @@ -1812,7 +1816,7 @@ $('.carousel').carousel({

    Initializes an input with a typeahead.

    Result

    -

    If the source are key/value pairs, the data-value attribute will contain the key.

    +

    If the source is an object with key/value pairs, the data-value attribute will contain the key.

    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index eb78edee..b7b9d366 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -58,9 +58,9 @@

    {{_i}}How can a fantastic library become any better? Check it out.{{/i}}

    -

    {{_i}}Action links{{/i}}

    -

    {{_i}}Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.{{/i}}

    -

    {{_i}}Action links look distinctly different than normal links.{{/i}}

    +

    {{_i}}Typeahead{{/i}}

    +

    {{_i}}With the improved typeahead, it's easy to fetch the data using AJAX.{{/i}}

    +

    {{_i}}It support key/value pairs (objects) next to normal arrays. Also you can convert a <select> to a typeahead.{{/i}}

    {{_i}}Input mask{{/i}}

    @@ -98,6 +98,11 @@
    +
    +

    {{_i}}Action links{{/i}}

    +

    {{_i}}Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.{{/i}}

    +

    {{_i}}Action links look distinctly different than normal links.{{/i}}

    +

    {{_i}}Form elements{{/i}}

    {{_i}}Go beyond uneditable input and create a full uneditable form, with disabled and uneditable elements.{{/i}}

    @@ -112,6 +117,17 @@

    {{_i}}Tabbable{{/i}}

    {{_i}}Tabs work better than ever. You now have a bordered tabbable available. Also, a container can be turned into a tabbable.{{/i}}

    +
    +
    +
    +

    {{_i}}Customize{{/i}}

    +

    {{_i}}Each customized bootstrap.zip contains a `custom.json` file, which can be used to use the same packages and variables when upgrading.{{/i}}

    +

    {{_i}}Automatically includes the CSS for jQuery plugins.{{/i}}

    +
    +
    +

    {{_i}}Download js plugins{{/i}}

    +

    {{_i}}Download a jQuery plugin directly from the javascript docs, including required CSS.{{/i}}

    +

    {{_i}}More{{/i}}

      diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 8d46a1b9..9810eadd 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1680,7 +1680,11 @@ $('.carousel').carousel({ {{_i}}source{{/i}} {{_i}}array, object, string, function{{/i}} [ ] - {{_i}}The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) or a function. The function is passed two arguments, the query value in the input field and the process callback. The function may be used synchronously by returning the data source directly or asynchronously via the process callback's single argument.{{/i}} + +

      {{_i}}The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) to get the data using AJAX or a function.{{/i}}

      +

      {{_i}}When using AJAX, the server should output a valid JSON array or key/value pair object.{{/i}}

      +

      {{_i}}The function is passed two arguments, the query value in the input field and the process callback. The function may be used synchronously by returning the data source directly or asynchronously via the process callback's single argument.{{/i}}

      + {{_i}}items{{/i}} @@ -1732,7 +1736,7 @@ $('.carousel').carousel({

      {{_i}}Initializes an input with a typeahead.{{/i}}

      {{_i}}Result{{/i}}

      -

      {{_i}}If the source are key/value pairs, the data-value attribute will contain the key.{{/i}}

      +

      {{_i}}If the source is an object with key/value pairs, the data-value attribute will contain the key.{{/i}}

      From a78887117c3d4f2199c114bd0430d30da87f9ed2 Mon Sep 17 00:00:00 2001 From: gboer Date: Sat, 12 Jan 2013 12:03:53 +0100 Subject: [PATCH 3/3] Update js/bootstrap-fileupload.js A bit better fix for when the element itself is the dismiss button --- js/bootstrap-fileupload.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/bootstrap-fileupload.js b/js/bootstrap-fileupload.js index b547661c..a9062250 100644 --- a/js/bootstrap-fileupload.js +++ b/js/bootstrap-fileupload.js @@ -159,8 +159,7 @@ if ($this.data('fileupload')) return $this.fileupload($this.data()) - var $target = $(e.target).is('[data-dismiss=fileupload],[data-trigger=fileupload]') ? - $(e.target) : $(e.target).parents('[data-dismiss=fileupload],[data-trigger=fileupload]').first() + var $target = $(e.target).closest('[data-dismiss="fileupload"],[data-trigger="fileupload"]'); if ($target.length > 0) { $target.trigger('click.fileupload') e.preventDefault()