Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts: docs/assets/bootstrap.zip
author: Mark Otto <[email protected]> 2012-03-10 11:23:47 -0800
committer: Mark Otto <[email protected]> 2012-03-10 11:23:47 -0800
commit: c414e57dccf0d0177f42df10d2f36f79581563d6 (patch)
tree: 59b7fdd5f757789f8d4ea58456b6b450efb337b0
parent: 305374ab1a49a1bdfbab0e52a2be218fc42f3cc0 (diff)
parent: 1562381114ce1ce5dc06d311ddb6d1e0f2048a1f (diff)
download: bootstrap-c414e57dccf0d0177f42df10d2f36f79581563d6.tar.xz
bootstrap-c414e57dccf0d0177f42df10d2f36f79581563d6.zip
18 files changed, 49 insertions, 31 deletions
diff --git a/Makefile b/Makefile
index 923c0ced3..92afa1578 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,10 @@ bootstrap:
 	lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
 	lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
 	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
-	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
+	uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
+	echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
+	cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
+	rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
 
 #
 # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O  )
@@ -56,4 +59,4 @@ watch:
 	watchr -e "watch('less/.*\.less') { system 'make' }"
 
 
-.PHONY: dist docs watch gh-pages
-\ No newline at end of file
+.PHONY: docs watch gh-pages
+\ No newline at end of file
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index b317f2936..b87f61992 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js
index 503155950..99f84f796 100644
--- a/docs/assets/js/bootstrap-typeahead.js
+++ b/docs/assets/js/bootstrap-typeahead.js
@@ -40,6 +40,7 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element.val(val)
+      this.$element.change();
       return this.hide()
     }
 
@@ -165,9 +166,6 @@
     }
 
   , keyup: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-
       switch(e.keyCode) {
         case 40: // down arrow
         case 38: // up arrow
@@ -180,6 +178,7 @@
           break
 
         case 27: // escape
+          if (!this.shown) return
           this.hide()
           break
 
@@ -187,10 +186,11 @@
           this.lookup()
       }
 
+      e.stopPropagation()
+      e.preventDefault()
   }
 
   , keypress: function (e) {
-      e.stopPropagation()
       if (!this.shown) return
 
       switch(e.keyCode) {
@@ -210,12 +210,12 @@
           this.next()
           break
       }
+
+      e.stopPropagation()
     }
 
   , blur: function (e) {
       var that = this
-      e.stopPropagation()
-      e.preventDefault()
       setTimeout(function () { that.hide() }, 150)
     }
 
diff --git a/docs/base-css.html b/docs/base-css.html
index 0f720d2cf..727432436 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Base · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/build/index.js b/docs/build/index.js
index 5321fa750..1a9cb387c 100644
--- a/docs/build/index.js
+++ b/docs/build/index.js
@@ -2,6 +2,7 @@
 var hogan = require('hogan.js')
   , fs    = require('fs')
   , prod  = process.argv[2] == 'production'
+  , title = 'Bootstrap'
 
 var layout, pages
 
@@ -23,6 +24,16 @@ pages.forEach(function (name) {
   context[name.replace(/\.mustache$/, '')] = 'active'
   context._i = true
   context.production = prod
+  context.title = name
+    .replace(/\.mustache/, '')
+    .replace(/\-.*/, '')
+    .replace(/(.)/, function ($1) { return $1.toUpperCase() })
+
+  if (context.title == 'Index') {
+    context.title = title
+  } else {
+    context.title += ' · ' + title
+  }
 
   page = hogan.compile(page, { sectionTags: [{o:'_i', c:'i'}] })
   page = layout.render(context, {
diff --git a/docs/components.html b/docs/components.html
index b4071a5a7..a3a389c98 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Components · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/download.html b/docs/download.html
index 04b1e6bb6..209123cfe 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Download · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/examples.html b/docs/examples.html
index 76eb4b59a..faab19ef6 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Examples · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
@@ -95,7 +95,7 @@
       <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
     </a>
     <h3>Fluid layout</h3>
-    <p>Uses our new responsive, fluid grid system to create seamless liquid layout.</p>
+    <p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
   </li>
   <li class="span4">
     <a class="thumbnail" href="examples/starter-template.html">
diff --git a/docs/index.html b/docs/index.html
index 4ecd5c12f..5041b8043 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/javascript.html b/docs/javascript.html
index 800f0ca7a..49d54db88 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Javascript · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/less.html b/docs/less.html
index 97847cc9d..5b8ad6f2d 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Less · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
@@ -717,8 +717,8 @@
   <div class="row">
     <div class="span4">
       <h3>Node with makefile</h3>
-      <p>Install the LESS command line compiler globally with npm by running the following command:</p>
-      <pre>$ npm install -g less</pre>
+      <p>Install the LESS command line compiler and uglify-js globally with npm by running the following command:</p>
+      <pre>$ npm install -g less uglify-js</pre>
       <p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
       <p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
     </div><!-- /span4 -->
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 07932f549..fce44222f 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Scaffolding · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index 832983e16..1f976e4c4 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>{{title}}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/docs/templates/pages/examples.mustache b/docs/templates/pages/examples.mustache
index 485fbc570..dee7d5651 100644
--- a/docs/templates/pages/examples.mustache
+++ b/docs/templates/pages/examples.mustache
@@ -19,7 +19,7 @@
       <img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
     </a>
     <h3>{{_i}}Fluid layout{{/i}}</h3>
-    <p>{{_i}}Uses our new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
+    <p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
   </li>
   <li class="span4">
     <a class="thumbnail" href="examples/starter-template.html">
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index 742b166d2..744861dea 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -641,8 +641,8 @@
   <div class="row">
     <div class="span4">
       <h3>{{_i}}Node with makefile{{/i}}</h3>
-      <p>{{_i}}Install the LESS command line compiler globally with npm by running the following command:{{/i}}</p>
-      <pre>$ npm install -g less</pre>
+      <p>{{_i}}Install the LESS command line compiler and uglify-js globally with npm by running the following command:{{/i}}</p>
+      <pre>$ npm install -g less uglify-js</pre>
       <p>{{_i}}Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.{{/i}}</p>
       <p>{{_i}}Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).{{/i}}</p>
     </div><!-- /span4 -->
diff --git a/docs/upgrading.html b/docs/upgrading.html
index f56f22545..e96e89c40 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Upgrading · Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
diff --git a/js/bootstrap-typeahead.js b/js/bootstrap-typeahead.js
index 503155950..99f84f796 100644
--- a/js/bootstrap-typeahead.js
+++ b/js/bootstrap-typeahead.js
@@ -40,6 +40,7 @@
   , select: function () {
       var val = this.$menu.find('.active').attr('data-value')
       this.$element.val(val)
+      this.$element.change();
       return this.hide()
     }
 
@@ -165,9 +166,6 @@
     }
 
   , keyup: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-
       switch(e.keyCode) {
         case 40: // down arrow
         case 38: // up arrow
@@ -180,6 +178,7 @@
           break
 
         case 27: // escape
+          if (!this.shown) return
           this.hide()
           break
 
@@ -187,10 +186,11 @@
           this.lookup()
       }
 
+      e.stopPropagation()
+      e.preventDefault()
   }
 
   , keypress: function (e) {
-      e.stopPropagation()
       if (!this.shown) return
 
       switch(e.keyCode) {
@@ -210,12 +210,12 @@
           this.next()
           break
       }
+
+      e.stopPropagation()
     }
 
   , blur: function (e) {
       var that = this
-      e.stopPropagation()
-      e.preventDefault()
       setTimeout(function () { that.hide() }, 150)
     }
 
diff --git a/js/tests/unit/bootstrap-typeahead.js b/js/tests/unit/bootstrap-typeahead.js
index 455ed415b..96ea7c45f 100644
--- a/js/tests/unit/bootstrap-typeahead.js
+++ b/js/tests/unit/bootstrap-typeahead.js
@@ -114,15 +114,19 @@ $(function () {
               source: ['aa', 'ab', 'ac']
             })
           , typeahead = $input.data('typeahead')
+          , changed = false
 
         $input.val('a')
         typeahead.lookup()
 
+        $input.change(function() { changed = true });
+
         $(typeahead.$menu.find('li')[2]).mouseover().click()
 
         equals($input.val(), 'ac', 'input value was correctly set')
         ok(!typeahead.$menu.is(':visible'), 'the menu was hidden')
+        ok(changed, 'a change event was fired')
 
         typeahead.$menu.remove()
       })
-})
-\ No newline at end of file
+})
author	Mark Otto <[email protected]>	2012-03-10 11:23:47 -0800
committer	Mark Otto <[email protected]>	2012-03-10 11:23:47 -0800
commit	c414e57dccf0d0177f42df10d2f36f79581563d6 (patch)
tree	59b7fdd5f757789f8d4ea58456b6b450efb337b0
parent	305374ab1a49a1bdfbab0e52a2be218fc42f3cc0 (diff)
parent	1562381114ce1ce5dc06d311ddb6d1e0f2048a1f (diff)
download	bootstrap-c414e57dccf0d0177f42df10d2f36f79581563d6.tar.xz bootstrap-c414e57dccf0d0177f42df10d2f36f79581563d6.zip