github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-20 03:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v2.0.4-j1a' into v2.0.4-p1-wip

Browse Source
This commit is contained in:
Arnold Daniels
2013-07-12 13:46:13 +02:00
parent 3696adb0fd 90b236bf5f
commit c070bdbcbd
8 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/assets/js/bootstrap-fileupload.js vendored
View File

@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-fileupload.js j1
* bootstrap-fileupload.js j1a
* http://jasny.github.com/bootstrap/javascript.html#fileupload
* ===========================================================
* Copyright 2012 Jasny BV, Netherlands.
@@ -56,7 +56,7 @@
},
change: function(e, invoked) {
var file = e.target.files[0]
var file = e.target.files !== undefined ? e.target.files[0] : { name: e.target.value.replace(/^.+\\/, '') }
if (!file || invoked === 'clear') return
this.$hidden.val('')
@@ -75,7 +75,7 @@
reader.readAsDataURL(file)
} else {
this.$preview.html(window.escape(file.name))
this.$preview.text(file.name)
this.$element.addClass('fileupload-exists').removeClass('fileupload-new')
}
},
@@ -118,6 +118,8 @@
var $this = $(this)
if ($this.data('fileupload')) return
$this.fileupload($this.data())
if ($(e.target).data('dismiss') == 'fileupload') $(e.target).trigger('click.fileupload')
})
})

8
docs/assets/js/bootstrap.js vendored
View File

@@ -2254,7 +2254,7 @@
}(window.jQuery)
/* ===========================================================
* bootstrap-fileupload.js j1
* bootstrap-fileupload.js j1a
* http://jasny.github.com/bootstrap/javascript.html#fileupload
* ===========================================================
* Copyright 2012 Jasny BV, Netherlands.
@@ -2311,7 +2311,7 @@
},
change: function(e, invoked) {
var file = e.target.files[0]
var file = e.target.files !== undefined ? e.target.files[0] : { name: e.target.value.replace(/^.+\\/, '') }
if (!file || invoked === 'clear') return
this.$hidden.val('')
@@ -2330,7 +2330,7 @@
reader.readAsDataURL(file)
} else {
this.$preview.html(window.escape(file.name))
this.$preview.text(file.name)
this.$element.addClass('fileupload-exists').removeClass('fileupload-new')
}
},
@@ -2373,6 +2373,8 @@
var $this = $(this)
if ($this.data('fileupload')) return
$this.fileupload($this.data())
if ($(e.target).data('dismiss') == 'fileupload') $(e.target).trigger('click.fileupload')
})
})

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
docs/index.html
View File

@@ -84,8 +84,8 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info">
<a href="https://github.com/jasny/bootstrap/" class="btn btn-primary btn-large" style="line-height: 48px" >View project on GitHub</a>
<a href="assets/bootstrap.zip" class="btn btn-large" >Download Bootstrap <small>(v2.0.4-j1)</small><br/><small>Includes all Jasny extensions</small></a>
<a href="assets/jasny-bootstrap.zip" class="btn btn-large" >Extend Bootstrap <small>(j1)</small><br/><small>Download extensions only</small></a>
<a href="assets/bootstrap.zip" class="btn btn-large" >Download Bootstrap <small>(v2.0.4-j1a)</small><br/><small>Includes all Jasny extensions</small></a>
<a href="assets/jasny-bootstrap.zip" class="btn btn-large" >Extend Bootstrap <small>(j1a)</small><br/><small>Download extensions only</small></a>
</p>
</div>
@@ -149,7 +149,7 @@
</div>
<div class="row">
<div class="span3">
<h3><a href="./base-css.html#action-links">Iconic icons</a></h3>
<h3><a href="./base-css.html#iconic">Iconic icons</a></h3>
<p>The iconic font set adds 170 new icons to Bootstrap. These icons can be used with buttons, menus, links, etc.</p>
<p>Because these icons are a font, they can be styled just like text.</p>
</div>

5
docs/javascript.html
View File

@@ -1448,6 +1448,7 @@ $('.carousel').carousel({
<h3>About</h3>
<p>This plugin turns a table row into a clickable link.</p>
<a href="assets/js/bootstrap-rowlink.js" target="_blank" class="btn">Download file</a>
<p class="muted"><strong>*</strong> Requires the <a href="./">Jasny extended CSS</a> to be included.</p>
</div>
<div class="span9 columns">
<h2>Example</h2>
@@ -1590,13 +1591,14 @@ $('.carousel').carousel({
================================================== -->
<section id="inputmask">
<div class="page-header">
<h1>Inputmask <small>bootstrap-inputmask.js</small></h1>
<h1>Input mask <small>bootstrap-inputmask.js</small></h1>
</div>
<div class="row">
<div class="span3 columns">
<h3>About</h3>
<p>Input masks can be used to force the user to enter data conform a specific format.</p>
<p>Unlike validation, the user can't enter any other key than the ones specified by the mask.</p>
<a href="assets/js/bootstrap-inputmask.js" target="_blank" class="btn">Download file</a>
</div>
<div class="span9 columns">
<h2>Example</h2>
@@ -1670,6 +1672,7 @@ $('.carousel').carousel({
<h3>About</h3>
<p>The file upload plugin allows you to create a visually appealing file or image upload widgets.</p>
<a href="assets/js/bootstrap-fileupload.js" target="_blank" class="btn">Download file</a>
<p class="muted"><strong>*</strong> Requires the <a href="./">Jasny extended CSS</a> to be included.</p>
</div>
<div class="span9 columns">

6
docs/templates/pages/index.mustache vendored
View File

@@ -9,8 +9,8 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info">
<a href="https://github.com/jasny/bootstrap/" class="btn btn-primary btn-large" style="line-height: 48px" {{#production}}onclick="_ga.push(['_trackEvent', 'Jumbotron actions', 'GitHub Project', 'View project on GitHub']);"{{/production}}>{{_i}}View project on GitHub{{/i}}</a>
<a href="assets/bootstrap.zip" class="btn btn-large" {{#production}}onclick="_ga.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.0.4-j1']);"{{/production}}>{{_i}}Download Bootstrap <small>(v2.0.4-j1)</small><br/><small>Includes all Jasny extensions</small>{{/i}}</a>
<a href="assets/jasny-bootstrap.zip" class="btn btn-large" {{#production}}onclick="_ga.push(['_trackEvent', 'Jumbotron actions', 'Download extensions', 'Download j1']);"{{/production}}>{{_i}}Extend Bootstrap <small>(j1)</small><br/><small>Download extensions only</small>{{/i}}</a>
<a href="assets/bootstrap.zip" class="btn btn-large" {{#production}}onclick="_ga.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.0.4-j1a']);"{{/production}}>{{_i}}Download Bootstrap <small>(v2.0.4-j1a)</small><br/><small>Includes all Jasny extensions</small>{{/i}}</a>
<a href="assets/jasny-bootstrap.zip" class="btn btn-large" {{#production}}onclick="_ga.push(['_trackEvent', 'Jumbotron actions', 'Download extensions', 'Download j1a']);"{{/production}}>{{_i}}Extend Bootstrap <small>(j1a)</small><br/><small>Download extensions only</small>{{/i}}</a>
</p>
</div>
@@ -74,7 +74,7 @@
</div>
<div class="row">
<div class="span3">
<h3><a href="./base-css.html#action-links">{{_i}}Iconic icons{{/i}}</a></h3>
<h3><a href="./base-css.html#iconic">{{_i}}Iconic icons{{/i}}</a></h3>
<p>{{_i}}The iconic font set adds 170 new icons to Bootstrap. These icons can be used with buttons, menus, links, etc.{{/i}}</p>
<p>{{_i}}Because these icons are a font, they can be styled just like text.{{/i}}</p>
</div>

5
docs/templates/pages/javascript.mustache vendored
View File

@@ -1373,6 +1373,7 @@ $('.carousel').carousel({
<h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}This plugin turns a table row into a clickable link.{{/i}}</p>
<a href="assets/js/bootstrap-rowlink.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<p class="muted"><strong>*</strong> {{_i}}Requires the <a href="./">Jasny extended CSS</a> to be included.{{/i}}</p>
</div>
<div class="span9 columns">
<h2>{{_i}}Example{{/i}}</h2>
@@ -1515,13 +1516,14 @@ $('.carousel').carousel({
================================================== -->
<section id="inputmask">
<div class="page-header">
<h1>{{_i}}Inputmask{{/i}} <small>bootstrap-inputmask.js</small></h1>
<h1>{{_i}}Input mask{{/i}} <small>bootstrap-inputmask.js</small></h1>
</div>
<div class="row">
<div class="span3 columns">
<h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}Input masks can be used to force the user to enter data conform a specific format.{{/i}}</p>
<p>{{_i}}Unlike validation, the user can't enter any other key than the ones specified by the mask.{{/i}}</p>
<a href="assets/js/bootstrap-inputmask.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
</div>
<div class="span9 columns">
<h2>{{_i}}Example{{/i}}</h2>
@@ -1595,6 +1597,7 @@ $('.carousel').carousel({
<h3>{{_i}}About{{/i}}</h3>
<p>{{_i}}The file upload plugin allows you to create a visually appealing file or image upload widgets.{{/i}}</p>
<a href="assets/js/bootstrap-fileupload.js" target="_blank" class="btn">{{_i}}Download file{{/i}}</a>
<p class="muted"><strong>*</strong> {{_i}}Requires the <a href="./">Jasny extended CSS</a> to be included.{{/i}}</p>
</div>
<div class="span9 columns">

8
js/bootstrap-fileupload.js vendored
View File

@@ -1,5 +1,5 @@
/* ===========================================================
* bootstrap-fileupload.js j1
* bootstrap-fileupload.js j1a
* http://jasny.github.com/bootstrap/javascript.html#fileupload
* ===========================================================
* Copyright 2012 Jasny BV, Netherlands.
@@ -56,7 +56,7 @@
},
change: function(e, invoked) {
var file = e.target.files[0]
var file = e.target.files !== undefined ? e.target.files[0] : { name: e.target.value.replace(/^.+\\/, '') }
if (!file || invoked === 'clear') return
this.$hidden.val('')
@@ -75,7 +75,7 @@
reader.readAsDataURL(file)
} else {
this.$preview.html(window.escape(file.name))
this.$preview.text(file.name)
this.$element.addClass('fileupload-exists').removeClass('fileupload-new')
}
},
@@ -118,6 +118,8 @@
var $this = $(this)
if ($this.data('fileupload')) return
$this.fileupload($this.data())
if ($(e.target).data('dismiss') == 'fileupload') $(e.target).trigger('click.fileupload')
})
})