You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/07/15 14:22:58 UTC
[1/3] Improved development server
Updated Branches:
refs/heads/master 03d1b7e0c -> 9b64526db
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/css-tests.css
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/css-tests.css b/src/fauxton/assets/less/bootstrap/tests/css-tests.css
deleted file mode 100644
index 9edaf69..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/css-tests.css
+++ /dev/null
@@ -1,139 +0,0 @@
-/*!
- * Bootstrap CSS Tests
- */
-
-
-/* Remove background image */
-body {
- background-image: none;
-}
-
-/* Space out subhead */
-.subhead {
- margin-bottom: 36px;
-}
-/*h4 {
- margin-bottom: 5px;
-}
-*/
-
-.type-test {
- margin-bottom: 20px;
- padding: 0 20px 20px;
- background: url(../../docs/assets/img/grid-baseline-20px.png);
-}
-.type-test h1,
-.type-test h2,
-.type-test h3,
-.type-test h4,
-.type-test h5,
-.type-test h6 {
- background-color: rgba(255,0,0,.2);
-}
-
-
-/* colgroup tests */
-.col1 {
- background-color: rgba(255,0,0,.1);
-}
-.col2 {
- background-color: rgba(0,255,0,.1);
-}
-.col3 {
- background-color: rgba(0,0,255,.1);
-}
-
-
-/* Fluid row inputs */
-#rowInputs .row > [class*=span],
-#fluidRowInputs .row-fluid > [class*=span] {
- background-color: rgba(255,0,0,.1);
-}
-
-
-/* Fluid grid */
-.fluid-grid {
- margin-bottom: 45px;
-}
-.fluid-grid .row {
- height: 40px;
- padding-top: 10px;
- margin-top: 10px;
- color: #ddd;
- text-align: center;
-}
-.fluid-grid .span1 {
- background-color: #999;
-}
-
-
-/* Gradients */
-
-[class^="gradient-"] {
- width: 100%;
- height: 400px;
- margin: 20px 0;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
-}
-
-.gradient-horizontal {
- background-color: #333333;
- background-image: -moz-linear-gradient(left, #555555, #333333);
- background-image: -webkit-gradient(linear, 0 0, 100% 0, from(#555555), to(#333333));
- background-image: -webkit-linear-gradient(left, #555555, #333333);
- background-image: -o-linear-gradient(left, #555555, #333333);
- background-image: linear-gradient(to right, #555555, #333333);
- background-repeat: repeat-x;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff333333', GradientType=1);
-}
-
-.gradient-vertical {
- background-color: #474747;
- background-image: -moz-linear-gradient(top, #555555, #333333);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#333333));
- background-image: -webkit-linear-gradient(top, #555555, #333333);
- background-image: -o-linear-gradient(top, #555555, #333333);
- background-image: linear-gradient(to bottom, #555555, #333333);
- background-repeat: repeat-x;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff555555', endColorstr='#ff333333', GradientType=0);
-}
-
-.gradient-directional {
- background-color: #333333;
- background-image: -moz-linear-gradient(45deg, #555555, #333333);
- background-image: -webkit-linear-gradient(45deg, #555555, #333333);
- background-image: -o-linear-gradient(45deg, #555555, #333333);
- background-image: linear-gradient(45deg, #555555, #333333);
- background-repeat: repeat-x;
-}
-
-.gradient-vertical-three {
- background-color: #8940a5;
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#00b3ee), color-stop(50%, #7a43b6), to(#c3325f));
- background-image: -webkit-linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
- background-image: -moz-linear-gradient(top, #00b3ee, #7a43b6 50%, #c3325f);
- background-image: -o-linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
- background-image: linear-gradient(#00b3ee, #7a43b6 50%, #c3325f);
- background-repeat: no-repeat;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff00b3ee', endColorstr='#ffc3325f', GradientType=0);
-}
-
-.gradient-radial {
- background-color: #333333;
- background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(#555555), to(#333333));
- background-image: -webkit-radial-gradient(circle, #555555, #333333);
- background-image: -moz-radial-gradient(circle, #555555, #333333);
- background-image: -o-radial-gradient(circle, #555555, #333333);
- background-repeat: no-repeat;
-}
-
-.gradient-striped {
- background-color: #555555;
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
- background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/css-tests.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/css-tests.html b/src/fauxton/assets/less/bootstrap/tests/css-tests.html
deleted file mode 100644
index c0cb148..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/css-tests.html
+++ /dev/null
@@ -1,1296 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>CSS Tests · Twitter Bootstrap</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
- <link href="../../docs/assets/css/docs.css" rel="stylesheet">
- <link href="../../docs/assets/js/google-code-prettify/prettify.css" rel="stylesheet">
-
- <!-- CSS just for the tests page -->
- <link href="css-tests.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
-
- <!-- Navbar
- ================================================== -->
- <div class="navbar navbar-inverse navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="brand" href="../../docs/index.html">Bootstrap</a>
- </div>
- </div>
- </div>
-
-
-<!-- Masthead
-================================================== -->
-<header class="jumbotron subhead" id="overview">
- <div class="container">
- <h1>CSS Tests</h1>
- <p class="lead">One stop shop for quick debugging and edge-case tests of CSS.</p>
- </div>
-</header>
-
-
-<div class="bs-docs-canvas">
-
- <div class="container">
-
-
-
-<!-- Typography
-================================================== -->
-
-<div class="page-header">
- <h1>Typography</h1>
-</div>
-
-<div class="row">
- <div class="span6">
- <div class="type-test">
- <h1>h1. Heading 1</h1>
- <h2>h2. Heading 2</h2>
- <h3>h3. Heading 3</h3>
- <h4>h4. Heading 4</h4>
- <h5>h5. Heading 5</h5>
- <h6>h6. Heading 6</h6>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- </div>
- </div>
- <div class="span6">
- <div class="type-test">
- <h1>h1. Heading 1</h1>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- <h2>h2. Heading 2</h2>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- <h3>h3. Heading 3</h3>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- <h4>h4. Heading 4</h4>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- <h5>h5. Heading 5</h5>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- <h6>h6. Heading 6</h6>
- <p>Sed posuere consectetur est at lobortis. Maecenas sed diam eget risus varius blandit sit amet non magna. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.</p>
- </div>
- </div>
-</div>
-
-
-
-<!-- Responsive images
-================================================== -->
-
-<div class="page-header">
- <h1>Responsive images</h1>
-</div>
-
-<div class="row">
- <div class="span4">
- <img src="http://placehold.it/600x600" height="200">
- </div>
- <div class="span4">
- <img src="http://placehold.it/600x600">
- </div>
- <div class="span4">
- <img src="http://placehold.it/600x600">
- </div>
-</div>
-
-<br>
-
-<div class="row">
- <div class="span4">
- <img src="http://placehold.it/600x900" style="width: 200px;">
- </div>
- <div class="span4">
- <img src="http://placehold.it/200x300">
- </div>
- <div class="span4">
- <img src="http://placehold.it/600x600">
- </div>
-</div>
-
-<br><br>
-
-
-
-
-<!-- Fluid grid
-================================================== -->
-
-<div class="page-header">
- <h1>Fluid grids</h1>
-</div>
-
-<div class="fluid-grid">
- <div class="row">
- <div class="span12">12
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="span11">11
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- <div class="span1">1
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="span10">10
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- <div class="span2">2
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="span9">9
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- <div class="span3">3
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="span8">8
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- <div class="span4">4
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="span7">7
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- <div class="span5">5
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="span6">6
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- <div class="span6">6
- <div class="row-fluid">
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- <div class="span1">1</div>
- </div>
- </div>
- </div>
-</div> <!-- fluid grids -->
-
-
-
-<!-- Tables
-================================================== -->
-
-<div class="page-header">
- <h1>Tables</h1>
-</div>
-
-<div class="row">
- <div class="span6">
- <h4>Bordered without thead</h4>
- <table class="table table-bordered">
- <tbody>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- </tbody>
- </table>
- <h4>Bordered without thead, with caption</h4>
- <table class="table table-bordered">
- <caption>Table caption</caption>
- <tbody>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- </tbody>
- </table>
- <h4>Bordered without thead, with colgroup</h4>
- <table class="table table-bordered">
- <colgroup>
- <col class="col1">
- <col class="col2">
- <col class="col3">
- </colgroup>
- <tbody>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td>3</td>
- <td>6</td>
- <td>9</td>
- </tr>
- </tfoot>
- </table>
- <h4>Bordered with thead, with colgroup</h4>
- <table class="table table-bordered">
- <colgroup>
- <col class="col1">
- <col class="col2">
- <col class="col3">
- </colgroup>
- <thead>
- <tr>
- <th>A</th>
- <th>B</th>
- <th>C</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td>3</td>
- <td>6</td>
- <td>9</td>
- </tr>
- </tfoot>
- </table>
- </div><!--/span-->
- <div class="span6">
- <h4>Bordered with thead and caption</h4>
- <table class="table table-bordered">
- <caption>Table caption</caption>
- <thead>
- <tr>
- <th>1</th>
- <th>2</th>
- <th>3</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td>2</td>
- <td>3</td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td>3</td>
- <td>6</td>
- <td>9</td>
- </tr>
- </tfoot>
- </table>
- <h4>Bordered with rowspan and colspan</h4>
- <table class="table table-bordered">
- <thead>
- <tr>
- <th>1</th>
- <th>2</th>
- <th>3</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="2">1 and 2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td rowspan="2">2</td>
- <td>3</td>
- </tr>
- <tr>
- <td rowspan="2">1</td>
- <td>3</td>
- </tr>
- <tr>
- <td colspan="2">2 and 3</td>
- </tr>
- </tbody>
- </table>
- </div><!--/span-->
-</div><!--/row-->
-
-
-<h4>Grid sizing</h4>
-<div class="row">
- <div class="span12">
- <table class="table table-bordered">
- <thead>
- <tr>
- <th class="span3">1</th>
- <th class="span4">2</th>
- <th>3</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="2">1 and 2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td rowspan="2">2</td>
- <td>3</td>
- </tr>
- <tr>
- <td rowspan="2">1</td>
- <td>3</td>
- </tr>
- <tr>
- <td colspan="2">2 and 3</td>
- </tr>
- </tbody>
- </table>
- </div>
-</div><!--/row-->
-
-<h4>Fluid grid sizing</h4>
-<div class="row-fluid">
- <div class="span12">
- <table class="table table-bordered">
- <thead>
- <tr>
- <th class="span3">1</th>
- <th class="span4">2</th>
- <th>3</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td colspan="2">1 and 2</td>
- <td>3</td>
- </tr>
- <tr>
- <td>1</td>
- <td rowspan="2">2</td>
- <td>3</td>
- </tr>
- <tr>
- <td rowspan="2">1</td>
- <td>3</td>
- </tr>
- <tr>
- <td colspan="2">2 and 3</td>
- </tr>
- </tbody>
- </table>
- </div>
-</div><!--/row-->
-
-
-
-<!-- Forms
-================================================== -->
-
-<div class="page-header">
- <h1>Forms</h1>
-</div>
-
-<h4>Buttons and button groups</h4>
-<form class="form-inline">
- <button class="btn btn-success">Save</button>
- <button class="btn btn-info">Add new</button>
- <div class="btn-group">
- <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
- <i class="icon-user"></i> User
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Profile</a></li>
- <li class="divider"></li>
- <li><a href="#">Sign Out</a></li>
- </ul>
- </div>
-</form>
-
-<h4>Horizontal form errors</h4>
-<form class="form-horizontal">
- <div class="control-group error">
- <label class="control-label" for="inputError">Radio with error</label>
- <div class="controls">
- <label class="radio">
- <input type="radio" id="inputError"> Oh hai
- </label>
- <span class="help-inline">Please correct the error</span>
- </div>
- </div>
-</form>
-
-<div class="row">
- <div class="span4">
- <h4>Prepend and append on inputs</h4>
- <form>
- <div class="controls">
- <div class="input-prepend">
- <span class="add-on">@</span>
- <input class="span2" id="prependedInput" size="16" type="text">
- </div>
- </div>
- <div class="controls">
- <div class="input-append">
- <input class="span2" id="prependedInput" size="16" type="text">
- <span class="add-on">@</span>
- </div>
- </div>
- <div class="controls">
- <div class="input-prepend input-append">
- <span class="add-on">$</span>
- <input class="span2" id="prependedInput" size="16" type="text">
- <span class="add-on">.00</span>
- </div>
- </div>
- </form>
- </div><!--/span-->
- <div class="span4">
- <h4>Prepend and append with uneditable</h4>
- <form>
- <div class="input-prepend">
- <span class="add-on">$</span>
- <span class="span2 uneditable-input">Some value here</span>
- </div>
- <div class="input-append">
- <span class="span2 uneditable-input">Some value here</span>
- <span class="add-on">.00</span>
- </div>
- <div class="input-prepend input-append">
- <span class="add-on">$</span>
- <span class="span2 uneditable-input">Some value here</span>
- <span class="add-on">.00</span>
- </div>
- </form>
- </div><!--/span-->
- <div class="span4">
- <h4>Prepend with type="submit"</h4>
- <form class="form-search">
- <div class="input-append">
- <input type="text" class="span2 search-query" value="" name="q">
- <input type="submit" value="Search" class="btn">
- </div>
- </form>
- <div class="input-append">
- <input type="text" class="span2" value="" name="">
- <input type="submit" value="Button" class="btn">
- </div>
- <div class="input-append">
- <input type="text" size="16" id="appendedInputButtons" class="span2">
- <input type="submit" value="Search" class="btn">
- <button type="button" class="btn">Options</button>
- </div>
- </div><!--/span-->
-</div><!--/row-->
-
-<h4>Fluid prepended and appended inputs</h4>
-<div class="row-fluid">
- <div class="span6">
- <form>
- <div class="controls">
- <div class="input-prepend">
- <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text">
- </div>
- </div>
- <div class="controls">
- <div class="input-append">
- <input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">@</span>
- </div>
- </div>
- <div class="controls">
- <div class="input-prepend input-append">
- <span class="add-on">$</span><input class="span2" id="prependedInput" size="16" type="text"><span class="add-on">.00</span>
- </div>
- </div>
- </form>
- </div>
-</div>
-
-<h4>Fixed row with inputs</h4>
-<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
-
-<div class="rowInputs">
- <div class="row">
- <div class="span12">
- <input type="text" class="span1" placeholder="span1">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span2" placeholder="span2">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span3" placeholder="span3">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span4" placeholder="span4">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span5" placeholder="span5">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span6" placeholder="span6">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span7" placeholder="span7">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span8" placeholder="span8">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span9" placeholder="span9">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span10" placeholder="span10">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span11" placeholder="span11">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row">
- <div class="span12">
- <input type="text" class="span12" placeholder="span12">
- </div><!--/span-->
- </div><!--/row-->
-</div>
-<br>
-
-<h4>Fluid row with inputs</h4>
-<p>Inputs should not extend past the light red background, set on their parent, a <code>.span*</code> column.</p>
-<div id="fluidRowInputs">
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span1" placeholder="span1">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span2" placeholder="span2">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span3" placeholder="span3">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span4" placeholder="span4">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span5" placeholder="span5">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span6" placeholder="span6">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span7" placeholder="span7">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span8" placeholder="span8">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span9" placeholder="span9">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span10" placeholder="span10">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span11" placeholder="span11">
- </div><!--/span-->
- </div><!--/row-->
- <div class="row-fluid">
- <div class="span12">
- <input type="text" class="span12" placeholder="span12">
- </div><!--/span-->
- </div><!--/row-->
-</div>
-
-<br>
-
-<h4>Inline form in fluid row</h4>
-
-<div class="row-fluid">
- <div class="span12">
- <form class="form-inline">
- <input type="text" class="span3" placeholder="Email">
- <input type="password" class="span3" placeholder="Password">
- <label class="checkbox">
- <input type="checkbox"> Remember me
- </label>
- <button type="submit" class="btn">Sign in</button>
- </form>
- </div>
-</div>
-
-
-<br>
-
-
-<h4>Fluid textarea at .span12</h4>
-<div class="row-fluid">
- <div class="span12">
- <textarea class="span12"></textarea>
- </div>
-</div>
-
-
-<br>
-
-
-<h4>Selects</h4>
-<form>
- <select class="span4">
- <option>Option</option>
- </select>
-</form>
-
-
-<br>
-
-
-
-
-<!-- Dropdowns
-================================================== -->
-
-<div class="page-header">
- <h1>Dropdowns</h1>
-</div>
-
-<h4>Dropdown link with hash URL</h4>
-<ul class="nav nav-pills">
- <li class="active"><a href="#">Link</a></li>
- <li><a href="#">Example link</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">
- Dropdown <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
-</ul>
-
-<h4>Dropdown link with custom URL and data-target</h4>
-<ul class="nav nav-pills">
- <li class="active"><a href="#">Link</a></li>
- <li><a href="#">Example link</a></li>
- <li class="dropdown">
- <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
- Dropdown <span class="caret"></span>
- </a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </li>
-</ul>
-
-<h4>Dropdown on a button</h4>
-<div style="position: relative;">
- <button class="btn" type="button" data-toggle="dropdown">Dropdown <span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
-</div>
-
-<br>
-
-
-<!-- Thumbnails
-================================================== -->
-
-<div class="page-header">
- <h1>Thumbnails</h1>
-</div>
-
-<h4>Default thumbnails (no grid sizing)</h4>
-<ul class="thumbnails">
- <li class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </li>
- <li class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </li>
- <li class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </li>
- <li class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </li>
-</ul>
-
-<!-- NOT CURRENTLY SUPPORTED
-<h4>Offset thumbnails</h4>
-<ul class="thumbnails">
- <li class="span3 offset3">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span3">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span3">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
-</ul>
--->
-
-<h4>Standard grid sizing</h4>
-<ul class="thumbnails">
- <li class="span3">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span3 offset3">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span3">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
-</ul>
-
-<h4>Fluid thumbnails</h4>
-<div class="row-fluid">
- <div class="span8">
- <ul class="thumbnails">
- <li class="span4">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span4">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- <li class="span4">
- <a href="#" class="thumbnail">
- <img src="http://placehold.it/260x180" alt="">
- </a>
- </li>
- </ul>
- </div>
-</div>
-
-
-
-<!-- Tabs
-================================================== -->
-
-<div class="page-header">
- <h1>Tabs</h1>
-</div>
-
-<div class="tabbable tabs-left" style="margin-bottom: 18px;">
- <ul class="nav nav-tabs">
- <li class="active"><a href="#tab1" data-toggle="tab">Section 1</a></li>
- <li><a href="#tab2" data-toggle="tab">Section 2</a></li>
- <li><a href="#tab3" data-toggle="tab">Section 3</a></li>
- </ul>
- <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
- <div class="tab-pane active" id="tab1">
- <p>I'm in Section 1.</p>
-
- <div class="tabbable" style="background: #f5f5f5; padding: 20px;">
- <ul class="nav nav-tabs">
- <li class="active"><a href="#tab1-1" data-toggle="tab">1.1</a></li>
- <li><a href="#tab1-2" data-toggle="tab">1.2</a></li>
- <li><a href="#tab1-3" data-toggle="tab">1.3</a></li>
- </ul>
- <div class="tab-content" style="padding-bottom: 9px; border-bottom: 1px solid #ddd;">
- <div class="tab-pane active" id="tab1-1">
- <p>I'm in Section 1.1.</p>
- </div>
- <div class="tab-pane" id="tab1-2">
- <p>I'm in Section 1.2.</p>
- </div>
- <div class="tab-pane" id="tab1-3">
- <p>I'm in Section 1.3.</p>
- </div>
- </div>
- </div>
- </div>
- <div class="tab-pane" id="tab2">
- <p>Howdy, I'm in Section 2.</p>
- </div>
- <div class="tab-pane" id="tab3">
- <p>What up girl, this is Section 3.</p>
- </div>
- </div>
-</div> <!-- /tabbable -->
-
-<br>
-
-
-<!-- Labels
-================================================== -->
-
-<div class="page-header">
- <h1>Labels</h1>
-</div>
-
-<div class="row">
- <div class="span4">
- <h4>Inline label</h4>
- <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Maecenas sed diam <span class="label label-warning">Label name</span> eget risus varius blandit sit amet non magna. Fusce <code>.class-name</code> dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
- </div><!--/span-->
- <div class="span4">
- <form class="form-horizontal">
- <label>Example label</label>
- <input type="text" placeholder="Input"> <span class="help-inline"><span class="label">Hey!</span> Read this.</span>
- </form>
- </div><!--/span-->
- <div class="span4">
- <button class="btn">Action <span class="badge">2</span></button>
- <button class="btn">Action <span class="label">2</span></button>
- </div><!--/span-->
-</div><!--/row-->
-
-<br>
-
-
-<!-- Button groups
-================================================== -->
-
-<div class="page-header">
- <h1>Buttons</h1>
-</div>
-
-<table class="table table-bordered">
- <tbody>
- <tr>
- <td>
- Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue. Donec ullamcorper nulla non metus auctor fringilla. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
- </td>
- <td>
- <div class="btn-group">
- <button class="btn">1</button>
- <button class="btn">2</button>
- <button class="btn">3</button>
- <button class="btn">4</button>
- </div>
- </td>
- </tr>
- </tbody>
-</table>
-
-<h4>Mini buttons: text and icon</h4>
-<div class="btn-group">
- <button class="btn btn-mini">Button text</button>
- <button class="btn btn-mini"><i class="icon-cog"></i></button>
-</div>
-
-<br>
-
-
-
-<!-- Responsive utility classes
-================================================== -->
-
-<div class="page-header">
- <h1>Responsive utility classes</h1>
-</div>
-
-<h4>Visible on...</h4>
-<ul class="responsive-utilities-test visible-on">
- <li>Phone<span class="visible-phone">✔ Phone</span></li>
- <li>Tablet<span class="visible-tablet">✔ Tablet</span></li>
- <li>Desktop<span class="visible-desktop">✔ Desktop</span></li>
-</ul>
-<ul class="responsive-utilities-test visible-on">
- <li>Phone + Tablet<span class="visible-phone visible-tablet">✔ Phone + Tablet</span></li>
- <li>Tablet + Desktop<span class="visible-tablet visible-desktop">✔ Tablet + Desktop</span></li>
- <li>All<span class="visible-phone visible-tablet visible-desktop">✔ All</span></li>
-</ul>
-
-<h4>Hidden on...</h4>
-<ul class="responsive-utilities-test hidden-on">
- <li>Phone<span class="hidden-phone">✔ Phone</span></li>
- <li>Tablet<span class="hidden-tablet">✔ Tablet</span></li>
- <li>Desktop<span class="hidden-desktop">✔ Desktop</span></li>
-</ul>
-<ul class="responsive-utilities-test hidden-on">
- <li>Phone + Tablet<span class="hidden-phone hidden-tablet">✔ Phone + Tablet</span></li>
- <li>Tablet + Desktop<span class="hidden-tablet hidden-desktop">✔ Tablet + Desktop</span></li>
- <li>All<span class="hidden-phone hidden-tablet hidden-desktop">✔ All</span></li>
-</ul>
-
-
-
-<!-- Gradients
-================================================== -->
-
-<div class="page-header">
- <h1>Gradients</h1>
-</div>
-
-<h4>Horizontal</h4>
-<div class="gradient-horizontal"></div>
-
-<h4>Vertical</h4>
-<div class="gradient-vertical"></div>
-
-<h4>Directional</h4>
-<div class="gradient-directional"></div>
-
-<h4>Three colors</h4>
-<div class="gradient-vertical-three"></div>
-
-<h4>Radial</h4>
-<div class="gradient-radial"></div>
-
-<h4>Striped</h4>
-<div class="gradient-striped"></div>
-
-
-
-
-
-
-
- </div><!-- /container -->
-
-
-
- <!-- Footer
- ================================================== -->
- <footer class="footer">
- <div class="container">
- <p class="pull-right"><a href="#">Back to top</a></p>
- <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
- <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
- <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
- <ul class="footer-links">
- <li><a href="http://blog.getbootstrap.com">Read the blog</a></li>
- <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Submit issues</a></li>
- <li><a href="https://github.com/twitter/bootstrap/wiki">Roadmap and changelog</a></li>
- </ul>
- </div>
- </footer>
-
-</div>
-
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
- <script src="../../docs/assets/js/jquery.js"></script>
- <script src="../../docs/assets/js/google-code-prettify/prettify.js"></script>
- <script src="../../docs/assets/js/bootstrap-transition.js"></script>
- <script src="../../docs/assets/js/bootstrap-alert.js"></script>
- <script src="../../docs/assets/js/bootstrap-modal.js"></script>
- <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
- <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../docs/assets/js/bootstrap-tab.js"></script>
- <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
- <script src="../../docs/assets/js/bootstrap-popover.js"></script>
- <script src="../../docs/assets/js/bootstrap-button.js"></script>
- <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
- <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
- <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
- <script src="../../docs/assets/js/application.js"></script>
-
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/forms-responsive.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/forms-responsive.html b/src/fauxton/assets/less/bootstrap/tests/forms-responsive.html
deleted file mode 100644
index 846d5b4..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/forms-responsive.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
- <style>
- body {
- padding-top: 30px;
- padding-bottom: 30px;
- }
- </style>
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <form class="container">
-
- <div class="page-header">
- <h1>Fixed grid</h1>
- </div>
-
- <h3>Vertical alignment</h3>
- <input type="text" class="span2" placeholder="span2">
- <select class="span2"><option>span2</option></select>
- <span class="uneditable-input span2">span1</span>
-
- <h3>Width across elements</h3>
- <div>
- <input type="text" class="span2" placeholder="span2">
- </div>
- <div>
- <select class="span2"><option>span2</option></select>
- </div>
- <div>
- <span class="uneditable-input span2">span2</span>
- </div>
-
-
- <div class="page-header">
- <h1>Fluid grid</h1>
- </div>
-
- <div class="row-fluid">
- <input type="text" class="span2" placeholder="span2">
- <select class="span2"><option>span2</option></select>
- <span class="uneditable-input span2">span1</span>
- </div>
-
- </form> <!-- /container -->
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/forms.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/forms.html b/src/fauxton/assets/less/bootstrap/tests/forms.html
deleted file mode 100644
index a63d728..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/forms.html
+++ /dev/null
@@ -1,179 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
- <style>
- body {
- padding-top: 30px;
- padding-bottom: 30px;
- }
- </style>
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <form class="container">
-
- <div class="page-header">
- <h1>Form controls</h1>
- </div>
-
- <div class="row">
- <div class="span4">
-
- <label>Select</label>
- <select>
- <option>Select</option>
- <option>Option 2</option>
- <option>Option 3</option>
- </select>
-
- <hr>
-
- <label>textarea</label>
- <textarea>Textarea</textarea>
-
- <hr>
-
- <label>text</label>
- <input type="text" value="Text input">
-
- <hr>
-
- <label>password</label>
- <input type="password" value="Password input">
-
- <hr>
-
- <label>checkbox</label>
- <input type="checkbox" value="">
-
- <hr>
-
- <label>radio</label>
- <input type="radio" value="">
-
- <hr>
-
- <label>button</label>
- <input type="button" value="Button">
-
- <hr>
-
- <label>submit</label>
- <input type="submit" value="Submit">
-
- <hr>
-
- <label>reset</label>
- <input type="reset" value="Reset">
-
- </div><!-- /span4 -->
- <div class="span4">
-
- <label>file</label>
- <input type="file" value="">
-
- <hr>
-
- <label>hidden</label>
- <input type="hidden" value="hidden">
-
- <hr>
-
- <label>image</label>
- <input type="image" value="">
-
- <hr>
-
- <label>datetime</label>
- <input type="datetime" value="">
-
- <hr>
-
- <label>datetime-local</label>
- <input type="datetime-local" value="">
-
- <hr>
-
- <label>date</label>
- <input type="date" value="">
-
- <hr>
-
- <label>month</label>
- <input type="month" value="">
-
- <hr>
-
- <label>time</label>
- <input type="time" value="">
-
- <hr>
-
- <label>week</label>
- <input type="week" value="">
-
- </div><!-- /span4 -->
- <div class="span4">
-
- <label>number</label>
- <input type="number" value="">
-
- <hr>
-
- <label>range</label>
- <input type="range" value="">
-
- <hr>
-
- <label>email</label>
- <input type="email" value="">
-
- <hr>
-
- <label>url</label>
- <input type="url" value="">
-
- <hr>
-
- <label>search</label>
- <input type="search" value="">
-
- <hr>
-
- <label>tel</label>
- <input type="tel" value="">
-
- <hr>
-
- <label>color</label>
- <input type="color" value="">
-
- </div><!-- /span4 -->
- </div><!-- /row -->
-
- </form> <!-- /container -->
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/navbar-fixed-top.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/navbar-fixed-top.html b/src/fauxton/assets/less/bootstrap/tests/navbar-fixed-top.html
deleted file mode 100644
index 97b86fd..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/navbar-fixed-top.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-top: 60px;
- padding-bottom: 30px;
- }
- </style>
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <!-- Fixed navbar -->
- <div class="navbar navbar-fixed-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Project name</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li><a href="#contact">Contact</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="nav-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <ul class="nav pull-right">
- <li><a href="./navbar.html">Default</a></li>
- <li><a href="./navbar-static-top.html">Static top</a></li>
- <li class="active"><a href="./navbar-fixed-top.html">Fixed top</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
- <div class="container">
-
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="hero-unit">
- <h1>Navbar example</h1>
- <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
- <p>
- <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs »</a>
- </p>
- </div>
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../../docs/assets/js/jquery.js"></script>
- <script src="../../docs/assets/js/bootstrap-transition.js"></script>
- <script src="../../docs/assets/js/bootstrap-alert.js"></script>
- <script src="../../docs/assets/js/bootstrap-modal.js"></script>
- <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
- <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../docs/assets/js/bootstrap-tab.js"></script>
- <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
- <script src="../../docs/assets/js/bootstrap-popover.js"></script>
- <script src="../../docs/assets/js/bootstrap-button.js"></script>
- <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
- <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
- <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/navbar-static-top.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/navbar-static-top.html b/src/fauxton/assets/less/bootstrap/tests/navbar-static-top.html
deleted file mode 100644
index 505ecb6..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/navbar-static-top.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-bottom: 30px;
- }
- .hero-unit {
- margin-top: 20px;
- }
- </style>
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <!-- Static navbar -->
- <div class="navbar navbar-static-top">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Project name</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li><a href="#contact">Contact</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="nav-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <ul class="nav pull-right">
- <li><a href="./navbar.html">Default</a></li>
- <li class="active"><a href="./navbar-static-top.html">Static top</a></li>
- <li><a href="./navbar-fixed-top.html">Fixed top</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
-
- <div class="container">
-
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="hero-unit">
- <h1>Navbar example</h1>
- <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
- <p>
- <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs »</a>
- </p>
- </div>
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../../docs/assets/js/jquery.js"></script>
- <script src="../../docs/assets/js/bootstrap-transition.js"></script>
- <script src="../../docs/assets/js/bootstrap-alert.js"></script>
- <script src="../../docs/assets/js/bootstrap-modal.js"></script>
- <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
- <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../docs/assets/js/bootstrap-tab.js"></script>
- <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
- <script src="../../docs/assets/js/bootstrap-popover.js"></script>
- <script src="../../docs/assets/js/bootstrap-button.js"></script>
- <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
- <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
- <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/navbar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/navbar.html b/src/fauxton/assets/less/bootstrap/tests/navbar.html
deleted file mode 100644
index c72da71..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/navbar.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Bootstrap, from Twitter</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-top: 0;
- padding-bottom: 30px;
- }
- .navbar {
- margin-top: 20px;
- }
- </style>
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
- <!-- Static navbar -->
- <div class="navbar">
- <div class="navbar-inner">
- <div class="container">
- <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </a>
- <a class="brand" href="#">Project name</a>
- <div class="nav-collapse collapse">
- <ul class="nav">
- <li class="active"><a href="#">Home</a></li>
- <li><a href="#about">About</a></li>
- <li><a href="#contact">Contact</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li class="nav-header">Nav header</li>
- <li><a href="#">Separated link</a></li>
- <li><a href="#">One more separated link</a></li>
- </ul>
- </li>
- </ul>
- <ul class="nav pull-right">
- <li class="active"><a href="./navbar.html">Default</a></li>
- <li><a href="./navbar-static-top.html">Static top</a></li>
- <li><a href="./navbar-fixed-top.html">Fixed top</a></li>
- </ul>
- </div><!--/.nav-collapse -->
- </div>
- </div>
- </div>
-
- <!-- Main hero unit for a primary marketing message or call to action -->
- <div class="hero-unit">
- <h1>Navbar example</h1>
- <p>This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.</p>
- <p>
- <a class="btn btn-large btn-primary" href="../components.html#navbar">View navbar docs »</a>
- </p>
- </div>
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../../docs/assets/js/jquery.js"></script>
- <script src="../../docs/assets/js/bootstrap-transition.js"></script>
- <script src="../../docs/assets/js/bootstrap-alert.js"></script>
- <script src="../../docs/assets/js/bootstrap-modal.js"></script>
- <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
- <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../docs/assets/js/bootstrap-tab.js"></script>
- <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
- <script src="../../docs/assets/js/bootstrap-popover.js"></script>
- <script src="../../docs/assets/js/bootstrap-button.js"></script>
- <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
- <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
- <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/package.json
----------------------------------------------------------------------
diff --git a/src/fauxton/package.json b/src/fauxton/package.json
index 5b63675..ad69f2f 100644
--- a/src/fauxton/package.json
+++ b/src/fauxton/package.json
@@ -11,21 +11,25 @@
"grunt": "~0.4.1",
"grunt-cli": "~0.1.6",
"couchapp": "~0.9.1",
- "grunt-contrib": "~0.5.0",
"grunt-contrib-cssmin": "~0.5.0",
+ "grunt-contrib-clean": "~0.4.1",
+ "grunt-contrib-jshint": "~0.6.0",
+ "grunt-contrib-concat": "~0.3.0",
+ "grunt-contrib-less": "~0.5.0",
+ "grunt-contrib-jst": "~0.5.0",
+ "grunt-contrib-watch": "~0.4.4",
"grunt-contrib-uglify": "~0.2.0",
+ "grunt-contrib-copy": "~0.4.1",
"grunt-couchapp": "~0.1.0",
"grunt-exec": "~0.4.0",
"grunt-init": "~0.2.0",
- "grunt-jasmine-task": "~0.2.3",
- "grunt-requirejs": "~0.3.3",
+ "grunt-contrib-requirejs": "~0.4.1",
"underscore": "~1.4.2",
"url": "~0.7.9",
"urls": "~0.0.3",
- "express": "~3.0.6",
- "http-proxy": "~0.10.2"
+ "http-proxy": "~0.10.2",
+ "send": "~0.1.1"
},
- "devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/settings.json.default
----------------------------------------------------------------------
diff --git a/src/fauxton/settings.json.default b/src/fauxton/settings.json.default
index 9716ceb..910488b 100644
--- a/src/fauxton/settings.json.default
+++ b/src/fauxton/settings.json.default
@@ -7,12 +7,23 @@
{ "name": "auth" }
],
"template": {
- "src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
- "variables": {
- "assets_root": "./",
- "requirejs": "require.js",
- "base": null
+ "development": {
+ "src": "assets/index.underscore",
+ "dest": "dist/debug/index.html",
+ "variables": {
+ "requirejs": "/assets/js/libs/require.js",
+ "css": "./css/index.css",
+ "base": null
+ }
+ },
+ "release": {
+ "src": "assets/index.underscore",
+ "dest": "dist/debug/index.html",
+ "variables": {
+ "requirejs": "./js/require.js",
+ "css": "./css/index.css",
+ "base": null
+ }
}
},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/tasks/couchserver.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/couchserver.js b/src/fauxton/tasks/couchserver.js
index 0d1dc7a..baf2b30 100644
--- a/src/fauxton/tasks/couchserver.js
+++ b/src/fauxton/tasks/couchserver.js
@@ -13,17 +13,18 @@
module.exports = function (grunt) {
var log = grunt.log;
- grunt.registerTask("couchserver", 'Run a couch dev proxy server', function () {
+ grunt.registerTask("couchserver", 'Run a couch dev proxy server', function () {
var fs = require("fs"),
- path = require("path"),
- httpProxy = require('http-proxy'),
- express = require("express"),
- options = grunt.config('couchserver'),
- app = express();
+ path = require("path"),
+ http = require("http"),
+ httpProxy = require('http-proxy'),
+ send = require('send'),
+ options = grunt.config('couchserver');
// Options
- var dist_dir = options.dist || './dist/debug/';
- var port = options.port || 8000;
+ var dist_dir = options.dist || './dist/debug/',
+ app_dir = './app',
+ port = options.port || 8000;
// Proxy options with default localhost
var proxy_settings = options.proxy || {
@@ -37,44 +38,56 @@ module.exports = function (grunt) {
// inform grunt that this task is async
var done = this.async();
- // serve any javascript or css files from here
- app.get(/\.css$|\.js$|img/, function (req, res) {
- res.sendfile(path.join(dist_dir,req.url));
- });
-
// create proxy to couch for all couch requests
var proxy = new httpProxy.HttpProxy(proxy_settings);
- // serve main index file from here
- // Also proxy out to the base CouchDB host for handle_welcome_req.
- // We still need to reach the top level CouchDB host even through
- // the proxy.
- app.get('/', function (req, res) {
- var accept = req.headers.accept.split(',');
- if (accept[0] == 'application/json') {
- proxy.proxyRequest(req, res);
- } else {
- res.sendfile(path.join(dist_dir, 'index.html'));
- }
- });
+ http.createServer(function (req, res) {
+ var url = req.url,
+ accept = req.headers.accept.split(','),
+ filePath;
+
+ if (!!url.match(/assets/)) {
+ // serve any javascript or css files from here assets dir
+ filePath = path.join('./',req.url);
+ } else if (!!url.match(/\.css|img/)) {
+ filePath = path.join(dist_dir,req.url);
+ } else if (!!url.match(/\/js/)) {
+ // serve any javascript or files from dist debug dir
+ filePath = path.join(dist_dir,req.url);
+ } else if (!!url.match(/\.js$|\.html$/)) {
+ // server js from app directory
+ filePath = path.join(app_dir,req.url.replace('/_utils/fauxton/app',''));
+ } else if (url === '/' && accept[0] !== 'application/json') {
+ // serve main index file from here
+ filePath = path.join(dist_dir, 'index.html');
+ };
+
+ if (filePath) {
+ return send(req, filePath)
+ .on('error', function (err) {
+ if (err.status === 404) {
+ log.writeln('Could not locate', filePath);
+ } else {
+ log.writeln('ERROR', filePath, err);
+ }
+ })
+ .pipe(res);
+ }
- app.all('*', function (req, res) {
proxy.proxyRequest(req, res);
- });
+ }).listen(port);
// Fail this task if any errors have been logged
if (grunt.errors) {
return false;
}
- var watch = grunt.util.spawn({cmd: 'bbb', grunt: true, args: ['watch']}, function (error, result, code) {/* log.writeln(String(result));*/ });
+ var watch = grunt.util.spawn({cmd: 'grunt', grunt: true, args: ['watch']}, function (error, result, code) {/* log.writeln(String(result));*/ });
watch.stdout.pipe(process.stdout);
watch.stderr.pipe(process.stderr);
log.writeln('Listening on ' + port);
- app.listen(port);
-
});
};
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/tasks/fauxton.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/fauxton.js b/src/fauxton/tasks/fauxton.js
index a26f9f8..ac48cf3 100644
--- a/src/fauxton/tasks/fauxton.js
+++ b/src/fauxton/tasks/fauxton.js
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
grunt.file.write(data.dest, tmpl(data.variables));
});
- grunt.registerMultiTask('get_deps', 'Fetch external dependencies', function() {
+ grunt.registerMultiTask('get_deps', 'Fetch external dependencies', function(version) {
grunt.log.writeln("Fetching external dependencies");
var path = require('path');
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/tasks/helper.js
----------------------------------------------------------------------
diff --git a/src/fauxton/tasks/helper.js b/src/fauxton/tasks/helper.js
index a7eddbf..b3a9fbd 100644
--- a/src/fauxton/tasks/helper.js
+++ b/src/fauxton/tasks/helper.js
@@ -31,10 +31,12 @@ exports.init = function(grunt) {
this.readSettingsFile().deps.forEach(callback);
},
- watchFiles: function (defaults) {
+ watchFiles: function (fileExtensions, defaults) {
return _.reduce(this.readSettingsFile().deps, function (files, dep) {
if (dep.path) {
- files.push(path.join(dep.path, '**/*'));
+ _.each(fileExtensions, function (fileExtension) {
+ files.push(path.join(dep.path, '**/*' + fileExtension ));
+ });
}
return files
}, defaults);
[2/3] Improved development server
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/js/libs/require.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/libs/require.js b/src/fauxton/assets/js/libs/require.js
index 0c6f152..2109a25 100644
--- a/src/fauxton/assets/js/libs/require.js
+++ b/src/fauxton/assets/js/libs/require.js
@@ -1,25 +1,28 @@
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.0.2 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.1.6 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
-/*jslint regexp: true, nomen: true */
-/*global window, navigator, document, importScripts, jQuery, setTimeout, opera */
+//Not using strict: uneven strict support in browsers, #392, and causes
+//problems with requirejs.exec()/transpiler plugins that may not be strict.
+/*jslint regexp: true, nomen: true, sloppy: true */
+/*global window, navigator, document, importScripts, setTimeout, opera */
var requirejs, require, define;
(function (global) {
- 'use strict';
-
- var version = '2.0.2',
+ var req, s, head, baseElement, dataMain, src,
+ interactiveScript, currentlyAddingScript, mainScript, subPath,
+ version = '2.1.6',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
- cjsRequireRegExp = /require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+ cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
currDirRegExp = /^\.\//,
- ostring = Object.prototype.toString,
+ op = Object.prototype,
+ ostring = op.toString,
+ hasOwn = op.hasOwnProperty,
ap = Array.prototype,
- aps = ap.slice,
apsp = ap.splice,
- isBrowser = !!(typeof window !== 'undefined' && navigator && document),
+ isBrowser = !!(typeof window !== 'undefined' && navigator && window.document),
isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
//PS3 indicates loaded and complete, but need to wait for complete
//specifically. Sequence is 'loading', 'loaded', execution,
@@ -33,9 +36,7 @@ var requirejs, require, define;
contexts = {},
cfg = {},
globalDefQueue = [],
- useInteractive = false,
- req, s, head, baseElement, dataMain, src,
- interactiveScript, currentlyAddingScript, mainScript, subPath;
+ useInteractive = false;
function isFunction(it) {
return ostring.call(it) === '[object Function]';
@@ -76,7 +77,11 @@ var requirejs, require, define;
}
function hasProp(obj, prop) {
- return obj.hasOwnProperty(prop);
+ return hasOwn.call(obj, prop);
+ }
+
+ function getOwn(obj, prop) {
+ return hasProp(obj, prop) && obj[prop];
}
/**
@@ -87,7 +92,7 @@ var requirejs, require, define;
function eachProp(obj, func) {
var prop;
for (prop in obj) {
- if (obj.hasOwnProperty(prop)) {
+ if (hasProp(obj, prop)) {
if (func(obj[prop], prop)) {
break;
}
@@ -98,9 +103,6 @@ var requirejs, require, define;
/**
* Simple function to mix in properties from source into target,
* but only if target does not already have a property of the same name.
- * This is not robust in IE for transferring methods that match
- * Object.prototype names, but the uses of mixin here seem unlikely to
- * trigger a problem related to that.
*/
function mixin(target, source, force, deepStringMixin) {
if (source) {
@@ -132,6 +134,10 @@ var requirejs, require, define;
return document.getElementsByTagName('script');
}
+ function defaultOnError(err) {
+ throw err;
+ }
+
//Allow getting a global that expressed in
//dot notation, like 'a.b.c'.
function getGlobal(value) {
@@ -145,41 +151,6 @@ var requirejs, require, define;
return g;
}
- function makeContextModuleFunc(func, relMap, enableBuildCallback) {
- return function () {
- //A version of a require function that passes a moduleName
- //value for items that may need to
- //look up paths relative to the moduleName
- var args = aps.call(arguments, 0), lastArg;
- if (enableBuildCallback &&
- isFunction((lastArg = args[args.length - 1]))) {
- lastArg.__requireJsBuild = true;
- }
- args.push(relMap);
- return func.apply(null, args);
- };
- }
-
- function addRequireMethods(req, context, relMap) {
- each([
- ['toUrl'],
- ['undef'],
- ['defined', 'requireDefined'],
- ['specified', 'requireSpecified']
- ], function (item) {
- var prop = item[1] || item[0];
- req[item[0]] = context ? makeContextModuleFunc(context[prop], relMap) :
- //If no context, then use default context. Reference from
- //contexts instead of early binding to default context, so
- //that during builds, the latest instance of the default
- //context with its config gets used.
- function () {
- var ctx = contexts[defContextName];
- return ctx[prop].apply(ctx, arguments);
- };
- });
- }
-
/**
* Constructs an error with a pointer to an URL with more information.
* @param {String} id the error ID that maps to an ID on a web page.
@@ -221,27 +192,30 @@ var requirejs, require, define;
}
function newContext(contextName) {
- var config = {
+ var inCheckLoaded, Module, context, handlers,
+ checkLoadedTimeoutId,
+ config = {
+ //Defaults. Do not set a default for map
+ //config to speed up normalize(), which
+ //will run faster if there is no default.
waitSeconds: 7,
baseUrl: './',
paths: {},
pkgs: {},
- shim: {}
+ shim: {},
+ config: {}
},
registry = {},
+ //registry of just enabled modules, to speed
+ //cycle breaking code when lots of modules
+ //are registered, but not activated.
+ enabledRegistry = {},
undefEvents = {},
defQueue = [],
defined = {},
urlFetched = {},
requireCounter = 1,
- unnormalizedCounter = 1,
- //Used to track the order in which modules
- //should be executed, by the order they
- //load. Important for consistent cycle resolution
- //behavior.
- waitAry = [],
- inCheckLoaded, Module, context, handlers,
- checkLoadedTimeoutId;
+ unnormalizedCounter = 1;
/**
* Trims the . and .. from an array of path segments.
@@ -254,7 +228,7 @@ var requirejs, require, define;
*/
function trimDots(ary) {
var i, part;
- for (i = 0; ary[i]; i+= 1) {
+ for (i = 0; ary[i]; i += 1) {
part = ary[i];
if (part === '.') {
ary.splice(i, 1);
@@ -287,11 +261,12 @@ var requirejs, require, define;
* @returns {String} normalized name
*/
function normalize(name, baseName, applyMap) {
- var baseParts = baseName && baseName.split('/'),
+ var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
+ foundMap, foundI, foundStarMap, starI,
+ baseParts = baseName && baseName.split('/'),
+ normalizedBaseParts = baseParts,
map = config.map,
- starMap = map && map['*'],
- pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
- foundMap;
+ starMap = map && map['*'];
//Adjust any relative paths.
if (name && name.charAt(0) === '.') {
@@ -299,25 +274,25 @@ var requirejs, require, define;
//otherwise, assume it is a top-level require that will
//be relative to baseUrl in the end.
if (baseName) {
- if (config.pkgs[baseName]) {
+ if (getOwn(config.pkgs, baseName)) {
//If the baseName is a package name, then just treat it as one
//name to concat the name with.
- baseParts = [baseName];
+ normalizedBaseParts = baseParts = [baseName];
} else {
//Convert baseName to array, and lop off the last part,
//so that . matches that 'directory' and not name of the baseName's
//module. For instance, baseName of 'one/two/three', maps to
//'one/two/three.js', but we want the directory, 'one/two' for
//this normalization.
- baseParts = baseParts.slice(0, baseParts.length - 1);
+ normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
}
- name = baseParts.concat(name.split('/'));
+ name = normalizedBaseParts.concat(name.split('/'));
trimDots(name);
//Some use of packages may use a . path to reference the
//'main' module name, so normalize for that.
- pkgConfig = config.pkgs[(pkgName = name[0])];
+ pkgConfig = getOwn(config.pkgs, (pkgName = name[0]));
name = name.join('/');
if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
name = pkgName;
@@ -330,7 +305,7 @@ var requirejs, require, define;
}
//Apply map config if available.
- if (applyMap && (baseParts || starMap) && map) {
+ if (applyMap && map && (baseParts || starMap)) {
nameParts = name.split('/');
for (i = nameParts.length; i > 0; i -= 1) {
@@ -340,30 +315,43 @@ var requirejs, require, define;
//Find the longest baseName segment match in the config.
//So, do joins on the biggest to smallest lengths of baseParts.
for (j = baseParts.length; j > 0; j -= 1) {
- mapValue = map[baseParts.slice(0, j).join('/')];
+ mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
- //baseName segment has config, find if it has one for
+ //baseName segment has config, find if it has one for
//this name.
if (mapValue) {
- mapValue = mapValue[nameSegment];
+ mapValue = getOwn(mapValue, nameSegment);
if (mapValue) {
//Match, update name to the new value.
foundMap = mapValue;
+ foundI = i;
break;
}
}
}
}
- if (!foundMap && starMap && starMap[nameSegment]) {
- foundMap = starMap[nameSegment];
- }
-
if (foundMap) {
- nameParts.splice(0, i, foundMap);
- name = nameParts.join('/');
break;
}
+
+ //Check for a star map match, but just hold on to it,
+ //if there is a shorter segment match later in a matching
+ //config, then favor over this star map.
+ if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
+ foundStarMap = getOwn(starMap, nameSegment);
+ starI = i;
+ }
+ }
+
+ if (!foundMap && foundStarMap) {
+ foundMap = foundStarMap;
+ foundI = starI;
+ }
+
+ if (foundMap) {
+ nameParts.splice(0, foundI, foundMap);
+ name = nameParts.join('/');
}
}
@@ -374,7 +362,7 @@ var requirejs, require, define;
if (isBrowser) {
each(scripts(), function (scriptNode) {
if (scriptNode.getAttribute('data-requiremodule') === name &&
- scriptNode.getAttribute('data-requirecontext') === context.contextName) {
+ scriptNode.getAttribute('data-requirecontext') === context.contextName) {
scriptNode.parentNode.removeChild(scriptNode);
return true;
}
@@ -383,18 +371,31 @@ var requirejs, require, define;
}
function hasPathFallback(id) {
- var pathConfig = config.paths[id];
+ var pathConfig = getOwn(config.paths, id);
if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
removeScript(id);
//Pop off the first array value, since it failed, and
//retry
pathConfig.shift();
- context.undef(id);
+ context.require.undef(id);
context.require([id]);
return true;
}
}
+ //Turns a plugin!resource to [plugin, resource]
+ //with the plugin being undefined if the name
+ //did not have a plugin prefix.
+ function splitPrefix(name) {
+ var prefix,
+ index = name ? name.indexOf('!') : -1;
+ if (index > -1) {
+ prefix = name.substring(0, index);
+ name = name.substring(index + 1, name.length);
+ }
+ return [prefix, name];
+ }
+
/**
* Creates a module mapping that includes plugin prefix, module
* name, and path. If parentModuleMap is provided it will
@@ -411,13 +412,12 @@ var requirejs, require, define;
* @returns {Object}
*/
function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
- var index = name ? name.indexOf('!') : -1,
+ var url, pluginModule, suffix, nameParts,
prefix = null,
parentName = parentModuleMap ? parentModuleMap.name : null,
originalName = name,
isDefine = true,
- normalizedName = '',
- url, pluginModule, suffix;
+ normalizedName = '';
//If no name, then it means it is a require call, generate an
//internal name.
@@ -426,14 +426,13 @@ var requirejs, require, define;
name = '_@r' + (requireCounter += 1);
}
- if (index !== -1) {
- prefix = name.substring(0, index);
- name = name.substring(index + 1, name.length);
- }
+ nameParts = splitPrefix(name);
+ prefix = nameParts[0];
+ name = nameParts[1];
if (prefix) {
prefix = normalize(prefix, parentName, applyMap);
- pluginModule = defined[prefix];
+ pluginModule = getOwn(defined, prefix);
}
//Account for relative paths if there is a base name.
@@ -451,16 +450,15 @@ var requirejs, require, define;
//A regular module.
normalizedName = normalize(name, parentName, applyMap);
- //Calculate url for the module, if it has a name.
- //Use name here since nameToUrl also calls normalize,
- //and for relative names that are outside the baseUrl
- //this causes havoc. Was thinking of just removing
- //parentModuleMap to avoid extra normalization, but
- //normalize() still does a dot removal because of
- //issue #142, so just pass in name here and redo
- //the normalization. Paths outside baseUrl are just
- //messy to support.
- url = context.nameToUrl(name, null, parentModuleMap);
+ //Normalized name may be a plugin ID due to map config
+ //application in normalize. The map config values must
+ //already be normalized, so do not need to redo that part.
+ nameParts = splitPrefix(normalizedName);
+ prefix = nameParts[0];
+ normalizedName = nameParts[1];
+ isNormalized = true;
+
+ url = context.nameToUrl(normalizedName);
}
}
@@ -480,14 +478,14 @@ var requirejs, require, define;
originalName: originalName,
isDefine: isDefine,
id: (prefix ?
- prefix + '!' + normalizedName :
- normalizedName) + suffix
+ prefix + '!' + normalizedName :
+ normalizedName) + suffix
};
}
function getModule(depMap) {
var id = depMap.id,
- mod = registry[id];
+ mod = getOwn(registry, id);
if (!mod) {
mod = registry[id] = new context.Module(depMap);
@@ -498,15 +496,20 @@ var requirejs, require, define;
function on(depMap, name, fn) {
var id = depMap.id,
- mod = registry[id];
+ mod = getOwn(registry, id);
if (hasProp(defined, id) &&
- (!mod || mod.defineEmitComplete)) {
+ (!mod || mod.defineEmitComplete)) {
if (name === 'defined') {
fn(defined[id]);
}
} else {
- getModule(depMap).on(name, fn);
+ mod = getModule(depMap);
+ if (mod.error && name === 'error') {
+ fn(mod.error);
+ } else {
+ mod.on(name, fn);
+ }
}
}
@@ -518,7 +521,7 @@ var requirejs, require, define;
errback(err);
} else {
each(ids, function (id) {
- var mod = registry[id];
+ var mod = getOwn(registry, id);
if (mod) {
//Set error on module, so it skips timeout checks.
mod.error = err;
@@ -551,170 +554,89 @@ var requirejs, require, define;
}
}
- /**
- * Helper function that creates a require function object to give to
- * modules that ask for it as a dependency. It needs to be specific
- * per module because of the implication of path mappings that may
- * need to be relative to the module name.
- */
- function makeRequire(mod, enableBuildCallback, altRequire) {
- var relMap = mod && mod.map,
- modRequire = makeContextModuleFunc(altRequire || context.require,
- relMap,
- enableBuildCallback);
-
- addRequireMethods(modRequire, context, relMap);
- modRequire.isBrowser = isBrowser;
-
- return modRequire;
- }
-
handlers = {
'require': function (mod) {
- return makeRequire(mod);
+ if (mod.require) {
+ return mod.require;
+ } else {
+ return (mod.require = context.makeRequire(mod.map));
+ }
},
'exports': function (mod) {
mod.usingExports = true;
if (mod.map.isDefine) {
- return (mod.exports = defined[mod.map.id] = {});
+ if (mod.exports) {
+ return mod.exports;
+ } else {
+ return (mod.exports = defined[mod.map.id] = {});
+ }
}
},
'module': function (mod) {
- return (mod.module = {
- id: mod.map.id,
- uri: mod.map.url,
- config: function () {
- return (config.config && config.config[mod.map.id]) || {};
- },
- exports: defined[mod.map.id]
- });
+ if (mod.module) {
+ return mod.module;
+ } else {
+ return (mod.module = {
+ id: mod.map.id,
+ uri: mod.map.url,
+ config: function () {
+ var c,
+ pkg = getOwn(config.pkgs, mod.map.id);
+ // For packages, only support config targeted
+ // at the main module.
+ c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) :
+ getOwn(config.config, mod.map.id);
+ return c || {};
+ },
+ exports: defined[mod.map.id]
+ });
+ }
}
};
- function removeWaiting(id) {
+ function cleanRegistry(id) {
//Clean up machinery used for waiting modules.
delete registry[id];
-
- each(waitAry, function (mod, i) {
- if (mod.map.id === id) {
- waitAry.splice(i, 1);
- if (!mod.defined) {
- context.waitCount -= 1;
- }
- return true;
- }
- });
- }
-
- function findCycle(mod, traced) {
- var id = mod.map.id,
- depArray = mod.depMaps,
- foundModule;
-
- //Do not bother with unitialized modules or not yet enabled
- //modules.
- if (!mod.inited) {
- return;
- }
-
- //Found the cycle.
- if (traced[id]) {
- return mod;
- }
-
- traced[id] = true;
-
- //Trace through the dependencies.
- each(depArray, function (depMap) {
- var depId = depMap.id,
- depMod = registry[depId];
-
- if (!depMod) {
- return;
- }
-
- if (!depMod.inited || !depMod.enabled) {
- //Dependency is not inited, so this cannot
- //be used to determine a cycle.
- foundModule = null;
- delete traced[id];
- return true;
- }
-
- //mixin traced to a new object for each dependency, so that
- //sibling dependencies in this object to not generate a
- //false positive match on a cycle. Ideally an Object.create
- //type of prototype delegation would be used here, but
- //optimizing for file size vs. execution speed since hopefully
- //the trees are small for circular dependency scans relative
- //to the full app perf.
- return (foundModule = findCycle(depMod, mixin({}, traced)));
- });
-
- return foundModule;
+ delete enabledRegistry[id];
}
- function forceExec(mod, traced, uninited) {
- var id = mod.map.id,
- depArray = mod.depMaps;
-
- if (!mod.inited || !mod.map.isDefine) {
- return;
- }
-
- if (traced[id]) {
- return defined[id];
- }
-
- traced[id] = mod;
-
- each(depArray, function(depMap) {
- var depId = depMap.id,
- depMod = registry[depId],
- value;
-
- if (handlers[depId]) {
- return;
- }
-
- if (depMod) {
- if (!depMod.inited || !depMod.enabled) {
- //Dependency is not inited,
- //so this module cannot be
- //given a forced value yet.
- uninited[id] = true;
- return;
- }
-
- //Get the value for the current dependency
- value = forceExec(depMod, traced, uninited);
+ function breakCycle(mod, traced, processed) {
+ var id = mod.map.id;
- //Even with forcing it may not be done,
- //in particular if the module is waiting
- //on a plugin resource.
- if (!uninited[depId]) {
- mod.defineDepById(depId, value);
+ if (mod.error) {
+ mod.emit('error', mod.error);
+ } else {
+ traced[id] = true;
+ each(mod.depMaps, function (depMap, i) {
+ var depId = depMap.id,
+ dep = getOwn(registry, depId);
+
+ //Only force things that have not completed
+ //being defined, so still in the registry,
+ //and only if it has not been matched up
+ //in the module already.
+ if (dep && !mod.depMatched[i] && !processed[depId]) {
+ if (getOwn(traced, depId)) {
+ mod.defineDep(i, defined[depId]);
+ mod.check(); //pass false?
+ } else {
+ breakCycle(dep, traced, processed);
+ }
}
- }
- });
-
- mod.check(true);
-
- return defined[id];
- }
-
- function modCheck(mod) {
- mod.check();
+ });
+ processed[id] = true;
+ }
}
function checkLoaded() {
- var waitInterval = config.waitSeconds * 1000,
+ var map, modId, err, usingPathFallback,
+ waitInterval = config.waitSeconds * 1000,
//It is possible to disable the wait interval by using waitSeconds of 0.
expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
noLoads = [],
+ reqCalls = [],
stillLoading = false,
- needCycleCheck = true,
- map, modId, err, usingPathFallback;
+ needCycleCheck = true;
//Do not bother if this call was a result of a cycle break.
if (inCheckLoaded) {
@@ -724,7 +646,7 @@ var requirejs, require, define;
inCheckLoaded = true;
//Figure out the state of all the modules.
- eachProp(registry, function (mod) {
+ eachProp(enabledRegistry, function (mod) {
map = mod.map;
modId = map.id;
@@ -733,6 +655,10 @@ var requirejs, require, define;
return;
}
+ if (!map.isDefine) {
+ reqCalls.push(mod);
+ }
+
if (!mod.error) {
//If the module should be executed, and it has not
//been inited and time is up, remember it.
@@ -767,31 +693,9 @@ var requirejs, require, define;
//Not expired, check for a cycle.
if (needCycleCheck) {
-
- each(waitAry, function (mod) {
- if (mod.defined) {
- return;
- }
-
- var cycleMod = findCycle(mod, {}),
- traced = {};
-
- if (cycleMod) {
- forceExec(cycleMod, traced, {});
-
- //traced modules may have been
- //removed from the registry, but
- //their listeners still need to
- //be called.
- eachProp(traced, modCheck);
- }
+ each(reqCalls, function (mod) {
+ breakCycle(mod, {}, {});
});
-
- //Now that dependencies have
- //been satisfied, trigger the
- //completion check that then
- //notifies listeners.
- eachProp(registry, modCheck);
}
//If still waiting on loads, and the waiting load is something
@@ -812,9 +716,9 @@ var requirejs, require, define;
}
Module = function (map) {
- this.events = undefEvents[map.id] || {};
+ this.events = getOwn(undefEvents, map.id) || {};
this.map = map;
- this.shim = config.shim[map.id];
+ this.shim = getOwn(config.shim, map.id);
this.depExports = [];
this.depMaps = [];
this.depMatched = [];
@@ -828,7 +732,7 @@ var requirejs, require, define;
};
Module.prototype = {
- init: function(depMaps, factory, errback, options) {
+ init: function (depMaps, factory, errback, options) {
options = options || {};
//Do not do more inits if already done. Can happen if there
@@ -857,7 +761,6 @@ var requirejs, require, define;
//doing a direct modification of the depMaps array
//would affect that config.
this.depMaps = depMaps && depMaps.slice(0);
- this.depMaps.rjsSkipMap = depMaps.rjsSkipMap;
this.errback = errback;
@@ -879,20 +782,6 @@ var requirejs, require, define;
}
},
- defineDepById: function (id, depExports) {
- var i;
-
- //Find the index for this dependency.
- each(this.depMaps, function (map, index) {
- if (map.id === id) {
- i = index;
- return true;
- }
- });
-
- return this.defineDep(i, depExports);
- },
-
defineDep: function (i, depExports) {
//Because of cycles, defined callback for a given
//export can be called more than once.
@@ -916,7 +805,9 @@ var requirejs, require, define;
//If the manager is for a plugin managed resource,
//ask the plugin to load it now.
if (this.shim) {
- makeRequire(this, true)(this.shim.deps || [], bind(this, function () {
+ context.makeRequire(this.map, {
+ enableBuildCallback: true
+ })(this.shim.deps || [], bind(this, function () {
return map.prefix ? this.callPlugin() : this.load();
}));
} else {
@@ -925,7 +816,7 @@ var requirejs, require, define;
}
},
- load: function() {
+ load: function () {
var url = this.map.url;
//Regular dependency.
@@ -936,21 +827,19 @@ var requirejs, require, define;
},
/**
- * Checks is the module is ready to define itself, and if so,
- * define it. If the silent argument is true, then it will just
- * define, but not notify listeners, and not ask for a context-wide
- * check of all loaded modules. That is useful for cycle breaking.
+ * Checks if the module is ready to define itself, and if so,
+ * define it.
*/
- check: function (silent) {
+ check: function () {
if (!this.enabled || this.enabling) {
return;
}
- var id = this.map.id,
+ var err, cjsModule,
+ id = this.map.id,
depExports = this.depExports,
exports = this.exports,
- factory = this.factory,
- err, cjsModule;
+ factory = this.factory;
if (!this.inited) {
this.fetch();
@@ -966,8 +855,13 @@ var requirejs, require, define;
if (this.depCount < 1 && !this.defined) {
if (isFunction(factory)) {
//If there is an error listener, favor passing
- //to that instead of throwing an error.
- if (this.events.error) {
+ //to that instead of throwing an error. However,
+ //only do it for define()'d modules. require
+ //errbacks should not be called for failures in
+ //their callbacks (#699). However if a global
+ //onError is set, use that.
+ if ((this.events.error && this.map.isDefine) ||
+ req.onError !== defaultOnError) {
try {
exports = context.execCb(id, factory, depExports, exports);
} catch (e) {
@@ -983,9 +877,9 @@ var requirejs, require, define;
//favor a non-undefined return value over exports use.
cjsModule = this.module;
if (cjsModule &&
- cjsModule.exports !== undefined &&
- //Make sure it is not already the exports value
- cjsModule.exports !== this.exports) {
+ cjsModule.exports !== undefined &&
+ //Make sure it is not already the exports value
+ cjsModule.exports !== this.exports) {
exports = cjsModule.exports;
} else if (exports === undefined && this.usingExports) {
//exports already set the defined value.
@@ -995,8 +889,8 @@ var requirejs, require, define;
if (err) {
err.requireMap = this.map;
- err.requireModules = [this.map.id];
- err.requireType = 'define';
+ err.requireModules = this.map.isDefine ? [this.map.id] : null;
+ err.requireType = this.map.isDefine ? 'define' : 'require';
return onError((this.error = err));
}
@@ -1016,14 +910,9 @@ var requirejs, require, define;
}
//Clean up
- delete registry[id];
+ cleanRegistry(id);
this.defined = true;
- context.waitCount -= 1;
- if (context.waitCount === 0) {
- //Clear the wait array used for cycles.
- waitAry = [];
- }
}
//Finished the define stage. Allow calling check again
@@ -1031,25 +920,32 @@ var requirejs, require, define;
//cycle.
this.defining = false;
- if (!silent) {
- if (this.defined && !this.defineEmitted) {
- this.defineEmitted = true;
- this.emit('defined', this.exports);
- this.defineEmitComplete = true;
- }
+ if (this.defined && !this.defineEmitted) {
+ this.defineEmitted = true;
+ this.emit('defined', this.exports);
+ this.defineEmitComplete = true;
}
+
}
},
- callPlugin: function() {
+ callPlugin: function () {
var map = this.map,
id = map.id,
- pluginMap = makeModuleMap(map.prefix, null, false, true);
+ //Map already normalized the prefix.
+ pluginMap = makeModuleMap(map.prefix);
+
+ //Mark this as a dependency for this plugin, so it
+ //can be traced for cycles.
+ this.depMaps.push(pluginMap);
on(pluginMap, 'defined', bind(this, function (plugin) {
- var name = this.map.name,
+ var load, normalizedMap, normalizedMod,
+ name = this.map.name,
parentName = this.map.parentMap ? this.map.parentMap.name : null,
- load, normalizedMap, normalizedMod;
+ localRequire = context.makeRequire(map.parentMap, {
+ enableBuildCallback: true
+ });
//If current map is not normalized, wait for that
//normalized name to load instead of continuing.
@@ -1061,19 +957,24 @@ var requirejs, require, define;
}) || '';
}
+ //prefix and name should already be normalized, no need
+ //for applying map config again either.
normalizedMap = makeModuleMap(map.prefix + '!' + name,
- this.map.parentMap,
- false,
- true);
+ this.map.parentMap);
on(normalizedMap,
- 'defined', bind(this, function (value) {
- this.init([], function () { return value; }, null, {
- enabled: true,
- ignore: true
- });
- }));
- normalizedMod = registry[normalizedMap.id];
+ 'defined', bind(this, function (value) {
+ this.init([], function () { return value; }, null, {
+ enabled: true,
+ ignore: true
+ });
+ }));
+
+ normalizedMod = getOwn(registry, normalizedMap.id);
if (normalizedMod) {
+ //Mark this as a dependency for this plugin, so it
+ //can be traced for cycles.
+ this.depMaps.push(normalizedMap);
+
if (this.events.error) {
normalizedMod.on('error', bind(this, function (err) {
this.emit('error', err);
@@ -1100,7 +1001,7 @@ var requirejs, require, define;
//since they will never be resolved otherwise now.
eachProp(registry, function (mod) {
if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
- removeWaiting(mod.map.id);
+ cleanRegistry(mod.map.id);
}
});
@@ -1109,9 +1010,19 @@ var requirejs, require, define;
//Allow plugins to load other code without having to know the
//context or how to 'complete' the load.
- load.fromText = function (moduleName, text) {
+ load.fromText = bind(this, function (text, textAlt) {
/*jslint evil: true */
- var hasInteractive = useInteractive;
+ var moduleName = map.name,
+ moduleMap = makeModuleMap(moduleName),
+ hasInteractive = useInteractive;
+
+ //As of 2.1.0, support just passing the text, to reinforce
+ //fromText only being called once per resource. Still
+ //support old style of passing moduleName but discard
+ //that moduleName in favor of the internal ref.
+ if (textAlt) {
+ text = textAlt;
+ }
//Turn off interactive script matching for IE for any define
//calls in the text, then turn it back on at the end.
@@ -1121,25 +1032,43 @@ var requirejs, require, define;
//Prime the system by creating a module instance for
//it.
- getModule(makeModuleMap(moduleName));
+ getModule(moduleMap);
- req.exec(text);
+ //Transfer any config to this other module.
+ if (hasProp(config.config, id)) {
+ config.config[moduleName] = config.config[id];
+ }
+
+ try {
+ req.exec(text);
+ } catch (e) {
+ return onError(makeError('fromtexteval',
+ 'fromText eval for ' + id +
+ ' failed: ' + e,
+ e,
+ [id]));
+ }
if (hasInteractive) {
useInteractive = true;
}
+ //Mark this as a dependency for the plugin
+ //resource
+ this.depMaps.push(moduleMap);
+
//Support anonymous modules.
context.completeLoad(moduleName);
- };
+
+ //Bind the value of that module to the value for this
+ //resource ID.
+ localRequire([moduleName], load);
+ });
//Use parentName here since the plugin's name is not reliable,
//could be some weird string with no path that actually wants to
//reference the parentName's path.
- plugin.load(map.name, makeRequire(map.parentMap, true, function (deps, cb) {
- deps.rjsSkipMap = true;
- return context.require(deps, cb);
- }), load, config);
+ plugin.load(map.name, localRequire, load, config);
}));
context.enable(pluginMap, this);
@@ -1147,14 +1076,9 @@ var requirejs, require, define;
},
enable: function () {
+ enabledRegistry[this.map.id] = this;
this.enabled = true;
- if (!this.waitPushed) {
- waitAry.push(this);
- context.waitCount += 1;
- this.waitPushed = true;
- }
-
//Set flag mentioning that the module is enabling,
//so that immediate calls to the defined callbacks
//for dependencies do not trigger inadvertent load
@@ -1171,10 +1095,10 @@ var requirejs, require, define;
depMap = makeModuleMap(depMap,
(this.map.isDefine ? this.map : this.map.parentMap),
false,
- !this.depMaps.rjsSkipMap);
+ !this.skipMap);
this.depMaps[i] = depMap;
- handler = handlers[depMap.id];
+ handler = getOwn(handlers, depMap.id);
if (handler) {
this.depExports[i] = handler(this);
@@ -1189,7 +1113,7 @@ var requirejs, require, define;
}));
if (this.errback) {
- on(depMap, 'error', this.errback);
+ on(depMap, 'error', bind(this, this.errback));
}
}
@@ -1199,7 +1123,7 @@ var requirejs, require, define;
//Skip special modules like 'require', 'exports', 'module'
//Also, don't call enable if it is already enabled,
//important in circular dependency cases.
- if (!handlers[id] && mod && !mod.enabled) {
+ if (!hasProp(handlers, id) && mod && !mod.enabled) {
context.enable(depMap, this);
}
}));
@@ -1207,7 +1131,7 @@ var requirejs, require, define;
//Enable each plugin that is used in
//a dependency
eachProp(this.pluginMaps, bind(this, function (pluginMap) {
- var mod = registry[pluginMap.id];
+ var mod = getOwn(registry, pluginMap.id);
if (mod && !mod.enabled) {
context.enable(pluginMap, this);
}
@@ -1218,7 +1142,7 @@ var requirejs, require, define;
this.check();
},
- on: function(name, cb) {
+ on: function (name, cb) {
var cbs = this.events[name];
if (!cbs) {
cbs = this.events[name] = [];
@@ -1233,14 +1157,17 @@ var requirejs, require, define;
if (name === 'error') {
//Now that the error handler was triggered, remove
//the listeners, since this broken Module instance
- //can stay around for a while in the registry/waitAry.
+ //can stay around for a while in the registry.
delete this.events[name];
}
}
};
function callGetModule(args) {
- getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
+ //Skip modules already defined.
+ if (!hasProp(defined, args[0])) {
+ getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
+ }
}
function removeListener(node, func, name, ieName) {
@@ -1280,16 +1207,36 @@ var requirejs, require, define;
};
}
- return (context = {
+ function intakeDefines() {
+ var args;
+
+ //Any defined modules in the global queue, intake them now.
+ takeGlobalQueue();
+
+ //Make sure any remaining defQueue items get properly processed.
+ while (defQueue.length) {
+ args = defQueue.shift();
+ if (args[0] === null) {
+ return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+ } else {
+ //args are id, deps, factory. Should be normalized by the
+ //define() function.
+ callGetModule(args);
+ }
+ }
+ }
+
+ context = {
config: config,
contextName: contextName,
registry: registry,
defined: defined,
urlFetched: urlFetched,
- waitCount: 0,
defQueue: defQueue,
Module: Module,
makeModuleMap: makeModuleMap,
+ nextTick: req.nextTick,
+ onError: onError,
/**
* Set a configuration for the context.
@@ -1307,20 +1254,26 @@ var requirejs, require, define;
//they are additive.
var pkgs = config.pkgs,
shim = config.shim,
- paths = config.paths,
- map = config.map;
-
- //Mix in the config values, favoring the new values over
- //existing ones in context.config.
- mixin(config, cfg, true);
-
- //Merge paths.
- config.paths = mixin(paths, cfg.paths, true);
+ objs = {
+ paths: true,
+ config: true,
+ map: true
+ };
- //Merge map
- if (cfg.map) {
- config.map = mixin(map || {}, cfg.map, true, true);
- }
+ eachProp(cfg, function (value, prop) {
+ if (objs[prop]) {
+ if (prop === 'map') {
+ if (!config.map) {
+ config.map = {};
+ }
+ mixin(config[prop], value, true, true);
+ } else {
+ mixin(config[prop], value, true);
+ }
+ } else {
+ config[prop] = value;
+ }
+ });
//Merge shim
if (cfg.shim) {
@@ -1331,8 +1284,8 @@ var requirejs, require, define;
deps: value
};
}
- if (value.exports && !value.exports.__buildReady) {
- value.exports = context.makeShimExports(value.exports);
+ if ((value.exports || value.init) && !value.exportsFn) {
+ value.exportsFn = context.makeShimExports(value);
}
shim[id] = value;
});
@@ -1371,7 +1324,12 @@ var requirejs, require, define;
//update the maps for them, since their info, like URLs to load,
//may have changed.
eachProp(registry, function (mod, id) {
- mod.map = makeModuleMap(id);
+ //If module already has init called, since it is too
+ //late to modify them, and ignore unnormalized ones
+ //since they are transient.
+ if (!mod.inited && !mod.map.unnormalized) {
+ mod.map = makeModuleMap(id);
+ }
});
//If a deps array or a config callback is specified, then call
@@ -1382,130 +1340,158 @@ var requirejs, require, define;
}
},
- makeShimExports: function (exports) {
- var func;
- if (typeof exports === 'string') {
- func = function () {
- return getGlobal(exports);
- };
- //Save the exports for use in nodefine checking.
- func.exports = exports;
- return func;
- } else {
- return function () {
- return exports.apply(global, arguments);
- };
+ makeShimExports: function (value) {
+ function fn() {
+ var ret;
+ if (value.init) {
+ ret = value.init.apply(global, arguments);
+ }
+ return ret || (value.exports && getGlobal(value.exports));
}
+ return fn;
},
- requireDefined: function (id, relMap) {
- return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
- },
+ makeRequire: function (relMap, options) {
+ options = options || {};
- requireSpecified: function (id, relMap) {
- id = makeModuleMap(id, relMap, false, true).id;
- return hasProp(defined, id) || hasProp(registry, id);
- },
+ function localRequire(deps, callback, errback) {
+ var id, map, requireMod;
- require: function (deps, callback, errback, relMap) {
- var moduleName, id, map, requireMod, args;
- if (typeof deps === 'string') {
- if (isFunction(callback)) {
- //Invalid call
- return onError(makeError('requireargs', 'Invalid require call'), errback);
+ if (options.enableBuildCallback && callback && isFunction(callback)) {
+ callback.__requireJsBuild = true;
}
- //Synchronous access to one module. If require.get is
- //available (as in the Node adapter), prefer that.
- //In this case deps is the moduleName and callback is
- //the relMap
- if (req.get) {
- return req.get(context, deps, callback);
- }
+ if (typeof deps === 'string') {
+ if (isFunction(callback)) {
+ //Invalid call
+ return onError(makeError('requireargs', 'Invalid require call'), errback);
+ }
+
+ //If require|exports|module are requested, get the
+ //value for them from the special handlers. Caveat:
+ //this only works while module is being defined.
+ if (relMap && hasProp(handlers, deps)) {
+ return handlers[deps](registry[relMap.id]);
+ }
- //Just return the module wanted. In this scenario, the
- //second arg (if passed) is just the relMap.
- moduleName = deps;
- relMap = callback;
+ //Synchronous access to one module. If require.get is
+ //available (as in the Node adapter), prefer that.
+ if (req.get) {
+ return req.get(context, deps, relMap, localRequire);
+ }
- //Normalize module name, if it contains . or ..
- map = makeModuleMap(moduleName, relMap, false, true);
- id = map.id;
+ //Normalize module name, if it contains . or ..
+ map = makeModuleMap(deps, relMap, false, true);
+ id = map.id;
- if (!hasProp(defined, id)) {
- return onError(makeError('notloaded', 'Module name "' +
- id +
- '" has not been loaded yet for context: ' +
- contextName));
+ if (!hasProp(defined, id)) {
+ return onError(makeError('notloaded', 'Module name "' +
+ id +
+ '" has not been loaded yet for context: ' +
+ contextName +
+ (relMap ? '' : '. Use require([])')));
+ }
+ return defined[id];
}
- return defined[id];
- }
- //Callback require. Normalize args. if callback or errback is
- //not a function, it means it is a relMap. Test errback first.
- if (errback && !isFunction(errback)) {
- relMap = errback;
- errback = undefined;
- }
- if (callback && !isFunction(callback)) {
- relMap = callback;
- callback = undefined;
- }
+ //Grab defines waiting in the global queue.
+ intakeDefines();
- //Any defined modules in the global queue, intake them now.
- takeGlobalQueue();
+ //Mark all the dependencies as needing to be loaded.
+ context.nextTick(function () {
+ //Some defines could have been added since the
+ //require call, collect them.
+ intakeDefines();
- //Make sure any remaining defQueue items get properly processed.
- while (defQueue.length) {
- args = defQueue.shift();
- if (args[0] === null) {
- return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
- } else {
- //args are id, deps, factory. Should be normalized by the
- //define() function.
- callGetModule(args);
- }
- }
+ requireMod = getModule(makeModuleMap(null, relMap));
- //Mark all the dependencies as needing to be loaded.
- requireMod = getModule(makeModuleMap(null, relMap));
+ //Store if map config should be applied to this require
+ //call for dependencies.
+ requireMod.skipMap = options.skipMap;
- requireMod.init(deps, callback, errback, {
- enabled: true
- });
+ requireMod.init(deps, callback, errback, {
+ enabled: true
+ });
- checkLoaded();
+ checkLoaded();
+ });
- return context.require;
- },
+ return localRequire;
+ }
- undef: function (id) {
- var map = makeModuleMap(id, null, true),
- mod = registry[id];
+ mixin(localRequire, {
+ isBrowser: isBrowser,
+
+ /**
+ * Converts a module name + .extension into an URL path.
+ * *Requires* the use of a module name. It does not support using
+ * plain URLs like nameToUrl.
+ */
+ toUrl: function (moduleNamePlusExt) {
+ var ext,
+ index = moduleNamePlusExt.lastIndexOf('.'),
+ segment = moduleNamePlusExt.split('/')[0],
+ isRelative = segment === '.' || segment === '..';
+
+ //Have a file extension alias, and it is not the
+ //dots from a relative path.
+ if (index !== -1 && (!isRelative || index > 1)) {
+ ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
+ moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+ }
- delete defined[id];
- delete urlFetched[map.url];
- delete undefEvents[id];
+ return context.nameToUrl(normalize(moduleNamePlusExt,
+ relMap && relMap.id, true), ext, true);
+ },
- if (mod) {
- //Hold on to listeners in case the
- //module will be attempted to be reloaded
- //using a different config.
- if (mod.events.defined) {
- undefEvents[id] = mod.events;
+ defined: function (id) {
+ return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
+ },
+
+ specified: function (id) {
+ id = makeModuleMap(id, relMap, false, true).id;
+ return hasProp(defined, id) || hasProp(registry, id);
}
+ });
+
+ //Only allow undef on top level require calls
+ if (!relMap) {
+ localRequire.undef = function (id) {
+ //Bind any waiting define() calls to this context,
+ //fix for #408
+ takeGlobalQueue();
+
+ var map = makeModuleMap(id, relMap, true),
+ mod = getOwn(registry, id);
+
+ delete defined[id];
+ delete urlFetched[map.url];
+ delete undefEvents[id];
+
+ if (mod) {
+ //Hold on to listeners in case the
+ //module will be attempted to be reloaded
+ //using a different config.
+ if (mod.events.defined) {
+ undefEvents[id] = mod.events;
+ }
- removeWaiting(id);
+ cleanRegistry(id);
+ }
+ };
}
+
+ return localRequire;
},
/**
* Called to enable a module if it is still in the registry
- * awaiting enablement. parent module is passed in for context,
- * used by the optimizer.
+ * awaiting enablement. A second arg, parent, the parent module,
+ * is passed in for context, when this method is overriden by
+ * the optimizer. Not shown here to keep code compact.
*/
- enable: function (depMap, parent) {
- var mod = registry[depMap.id];
+ enable: function (depMap) {
+ var mod = getOwn(registry, depMap.id);
if (mod) {
getModule(depMap).enable();
}
@@ -1518,9 +1504,9 @@ var requirejs, require, define;
* @param {String} moduleName the name of the module to potentially complete.
*/
completeLoad: function (moduleName) {
- var shim = config.shim[moduleName] || {},
- shExports = shim.exports && shim.exports.exports,
- found, args, mod;
+ var found, args, mod,
+ shim = getOwn(config.shim, moduleName) || {},
+ shExports = shim.exports;
takeGlobalQueue();
@@ -1545,11 +1531,9 @@ var requirejs, require, define;
//Do this after the cycle of callGetModule in case the result
//of those calls/init calls changes the registry.
- mod = registry[moduleName];
+ mod = getOwn(registry, moduleName);
- if (!found &&
- !defined[moduleName] &&
- mod && !mod.inited) {
+ if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
if (hasPathFallback(moduleName)) {
return;
@@ -1562,7 +1546,7 @@ var requirejs, require, define;
} else {
//A script that does not call define(), so just simulate
//the call for it.
- callGetModule([moduleName, (shim.deps || []), shim.exports]);
+ callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
}
}
@@ -1570,33 +1554,16 @@ var requirejs, require, define;
},
/**
- * Converts a module name + .extension into an URL path.
- * *Requires* the use of a module name. It does not support using
- * plain URLs like nameToUrl.
- */
- toUrl: function (moduleNamePlusExt, relModuleMap) {
- var index = moduleNamePlusExt.lastIndexOf('.'),
- ext = null;
-
- if (index !== -1) {
- ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
- moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
- }
-
- return context.nameToUrl(moduleNamePlusExt, ext, relModuleMap);
- },
-
- /**
* Converts a module name to a file path. Supports cases where
* moduleName may actually be just an URL.
+ * Note that it **does not** call normalize on the moduleName,
+ * it is assumed to have already been normalized. This is an
+ * internal API, not a public one. Use toUrl for the public API.
*/
- nameToUrl: function (moduleName, ext, relModuleMap) {
+ nameToUrl: function (moduleName, ext, skipExt) {
var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
parentPath;
- //Normalize module name if have a base relative module name to work from.
- moduleName = normalize(moduleName, relModuleMap && relModuleMap.id, true);
-
//If a colon is in the URL, it indicates a protocol is used and it is just
//an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
//or ends with .js, then assume the user meant to use an url and not a module id.
@@ -1617,8 +1584,8 @@ var requirejs, require, define;
//and work up from it.
for (i = syms.length; i > 0; i -= 1) {
parentModule = syms.slice(0, i).join('/');
- pkg = pkgs[parentModule];
- parentPath = paths[parentModule];
+ pkg = getOwn(pkgs, parentModule);
+ parentPath = getOwn(paths, parentModule);
if (parentPath) {
//If an array, it means there are a few choices,
//Choose the one that is desired
@@ -1641,7 +1608,8 @@ var requirejs, require, define;
}
//Join the path parts together, then figure out if baseUrl is needed.
- url = syms.join('/') + (ext || '.js');
+ url = syms.join('/');
+ url += (ext || (/\?/.test(url) || skipExt ? '' : '.js'));
url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
}
@@ -1657,7 +1625,7 @@ var requirejs, require, define;
},
/**
- * Executes a module callack function. Broken out as a separate function
+ * Executes a module callback function. Broken out as a separate function
* solely to allow the build system to sequence the files in the built
* layer in the right sequence.
*
@@ -1678,7 +1646,7 @@ var requirejs, require, define;
//all old browsers will be supported, but this one was easy enough
//to support and still makes sense.
if (evt.type === 'load' ||
- (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
+ (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
//Reset interactive script so a script node is not held onto for
//to long.
interactiveScript = null;
@@ -1695,10 +1663,13 @@ var requirejs, require, define;
onScriptError: function (evt) {
var data = getScriptData(evt);
if (!hasPathFallback(data.id)) {
- return onError(makeError('scripterror', 'Script error', evt, [data.id]));
+ return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
}
}
- });
+ };
+
+ context.require = context.makeRequire();
+ return context;
}
/**
@@ -1718,8 +1689,8 @@ var requirejs, require, define;
req = requirejs = function (deps, callback, errback, optional) {
//Find the right context, use default
- var contextName = defContextName,
- context, config;
+ var context, config,
+ contextName = defContextName;
// Determine if have config object in the call.
if (!isArray(deps) && typeof deps !== 'string') {
@@ -1739,7 +1710,7 @@ var requirejs, require, define;
contextName = config.context;
}
- context = contexts[contextName];
+ context = getOwn(contexts, contextName);
if (!context) {
context = contexts[contextName] = req.s.newContext(contextName);
}
@@ -1760,6 +1731,16 @@ var requirejs, require, define;
};
/**
+ * Execute something after the current tick
+ * of the event loop. Override for other envs
+ * that have a better solution than setTimeout.
+ * @param {Function} fn function to execute later.
+ */
+ req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
+ setTimeout(fn, 4);
+ } : function (fn) { fn(); };
+
+ /**
* Export require as a global, but only if it does not already exist.
*/
if (!require) {
@@ -1779,9 +1760,21 @@ var requirejs, require, define;
//Create default context.
req({});
- //Exports some context-sensitive methods on global require, using
- //default context if no context specified.
- addRequireMethods(req);
+ //Exports some context-sensitive methods on global require.
+ each([
+ 'toUrl',
+ 'undef',
+ 'defined',
+ 'specified'
+ ], function (prop) {
+ //Reference from contexts instead of early binding to default context,
+ //so that during builds, the latest instance of the default context
+ //with its config gets used.
+ req[prop] = function () {
+ var ctx = contexts[defContextName];
+ return ctx.require[prop].apply(ctx, arguments);
+ };
+ });
if (isBrowser) {
head = s.head = document.getElementsByTagName('head')[0];
@@ -1799,9 +1792,7 @@ var requirejs, require, define;
* function. Intercept/override it if you want custom error handling.
* @param {Error} err the error object.
*/
- req.onError = function (err) {
- throw err;
- };
+ req.onError = defaultOnError;
/**
* Does the request to load a module for the browser case.
@@ -1818,10 +1809,11 @@ var requirejs, require, define;
if (isBrowser) {
//In the browser so use a script tag
node = config.xhtml ?
- document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
- document.createElement('script');
+ document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+ document.createElement('script');
node.type = config.scriptType || 'text/javascript';
node.charset = 'utf-8';
+ node.async = true;
node.setAttribute('data-requirecontext', context.contextName);
node.setAttribute('data-requiremodule', moduleName);
@@ -1835,15 +1827,15 @@ var requirejs, require, define;
//UNFORTUNATELY Opera implements attachEvent but does not follow the script
//script execution mode.
if (node.attachEvent &&
- //Check if node.attachEvent is artificially added by custom script or
- //natively supported by browser
- //read https://github.com/jrburke/requirejs/issues/187
- //if we can NOT find [native code] then it must NOT natively supported.
- //in IE8, node.attachEvent does not have toString()
- //Note the test for "[native code" with no closing brace, see:
- //https://github.com/jrburke/requirejs/issues/273
- !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
- !isOpera) {
+ //Check if node.attachEvent is artificially added by custom script or
+ //natively supported by browser
+ //read https://github.com/jrburke/requirejs/issues/187
+ //if we can NOT find [native code] then it must NOT natively supported.
+ //in IE8, node.attachEvent does not have toString()
+ //Note the test for "[native code" with no closing brace, see:
+ //https://github.com/jrburke/requirejs/issues/273
+ !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
+ !isOpera) {
//Probably IE. IE (at least 6-8) do not fire
//script onload right after executing the script, so
//we cannot tie the anonymous define call to a name.
@@ -1854,7 +1846,7 @@ var requirejs, require, define;
node.attachEvent('onreadystatechange', context.onScriptLoad);
//It would be great to add an error handler here to catch
//404s in IE9+. However, onreadystatechange will fire before
- //the error handler, so that does not help. If addEvenListener
+ //the error handler, so that does not help. If addEventListener
//is used, then IE will fire error before load, but we cannot
//use that pathway given the connect.microsoft.com issue
//mentioned above about not doing the 'script execute,
@@ -1883,16 +1875,24 @@ var requirejs, require, define;
return node;
} else if (isWebWorker) {
- //In a web worker, use importScripts. This is not a very
- //efficient use of importScripts, importScripts will block until
- //its script is downloaded and evaluated. However, if web workers
- //are in play, the expectation that a build has been done so that
- //only one script needs to be loaded anyway. This may need to be
- //reevaluated if other use cases become common.
- importScripts(url);
-
- //Account for anonymous modules
- context.completeLoad(moduleName);
+ try {
+ //In a web worker, use importScripts. This is not a very
+ //efficient use of importScripts, importScripts will block until
+ //its script is downloaded and evaluated. However, if web workers
+ //are in play, the expectation that a build has been done so that
+ //only one script needs to be loaded anyway. This may need to be
+ //reevaluated if other use cases become common.
+ importScripts(url);
+
+ //Account for anonymous modules
+ context.completeLoad(moduleName);
+ } catch (e) {
+ context.onError(makeError('importscripts',
+ 'importScripts failed for ' +
+ moduleName + ' at ' + url,
+ e,
+ [moduleName]));
+ }
}
};
@@ -1924,24 +1924,31 @@ var requirejs, require, define;
//baseUrl, if it is not already set.
dataMain = script.getAttribute('data-main');
if (dataMain) {
-
- //Pull off the directory of data-main for use as the
- //baseUrl.
- src = dataMain.split('/');
- mainScript = src.pop();
- subPath = src.length ? src.join('/') + '/' : './';
+ //Preserve dataMain in case it is a path (i.e. contains '?')
+ mainScript = dataMain;
//Set final baseUrl if there is not already an explicit one.
if (!cfg.baseUrl) {
+ //Pull off the directory of data-main for use as the
+ //baseUrl.
+ src = mainScript.split('/');
+ mainScript = src.pop();
+ subPath = src.length ? src.join('/') + '/' : './';
+
cfg.baseUrl = subPath;
}
- //Strip off any trailing .js since dataMain is now
+ //Strip off any trailing .js since mainScript is now
//like a module name.
- dataMain = mainScript.replace(jsSuffixRegExp, '');
+ mainScript = mainScript.replace(jsSuffixRegExp, '');
+
+ //If mainScript is still a path, fall back to dataMain
+ if (req.jsExtRegExp.test(mainScript)) {
+ mainScript = dataMain;
+ }
//Put the data-main script in the files to load.
- cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
+ cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
return true;
}
@@ -1958,7 +1965,7 @@ var requirejs, require, define;
define = function (name, deps, callback) {
var node, context;
- //Allow for anonymous functions
+ //Allow for anonymous modules
if (typeof name !== 'string') {
//Adjust args appropriately
callback = deps;
@@ -1969,12 +1976,13 @@ var requirejs, require, define;
//This module may not have dependencies
if (!isArray(deps)) {
callback = deps;
- deps = [];
+ deps = null;
}
//If no name, and callback is a function, then figure out if it a
//CommonJS thing with dependencies.
- if (!deps.length && isFunction(callback)) {
+ if (!deps && isFunction(callback)) {
+ deps = [];
//Remove comments from the callback string,
//look for require calls, and pull them into the dependencies,
//but only if there are function args.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/less/bootstrap/tests/buttons.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/bootstrap/tests/buttons.html b/src/fauxton/assets/less/bootstrap/tests/buttons.html
deleted file mode 100644
index 5fe7f66..0000000
--- a/src/fauxton/assets/less/bootstrap/tests/buttons.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <meta charset="utf-8">
- <title>Buttons · Bootstrap</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <!-- Le styles -->
- <link href="../../docs/assets/css/bootstrap.css" rel="stylesheet">
- <style>
- body {
- padding-top: 30px;
- padding-bottom: 30px;
- }
- </style>
- <link href="../../docs/assets/css/bootstrap-responsive.css" rel="stylesheet">
-
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
-
- <!-- Le fav and touch icons -->
- <link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
- <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
- <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
- <link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
- </head>
-
- <body>
-
- <div class="container">
-
- <h2>Dropups</h2>
- <div class="btn-toolbar">
- <div class="btn-group dropup">
- <button class="btn">Dropup</button>
- <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- <div class="btn-group dropup">
- <button class="btn btn-primary">Dropup</button>
- <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- <div class="btn-group dropup">
- <button class="btn btn-danger">Dropup</button>
- <button class="btn btn-danger dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- <div class="btn-group dropup">
- <button class="btn btn-warning">Dropup</button>
- <button class="btn btn-warning dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- <div class="btn-group dropup">
- <button class="btn btn-success">Dropup</button>
- <button class="btn btn-success dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- <div class="btn-group dropup">
- <button class="btn btn-info">Dropup</button>
- <button class="btn btn-info dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- <div class="btn-group dropup">
- <button class="btn btn-inverse">Dropup</button>
- <button class="btn btn-inverse dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
- <ul class="dropdown-menu">
- <li><a href="#">Action</a></li>
- <li><a href="#">Another action</a></li>
- <li><a href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a href="#">Separated link</a></li>
- </ul>
- </div><!-- /btn-group -->
- </div><!-- /btn-toolbar -->
-
-
- </div> <!-- /container -->
-
- <!-- Le javascript
- ================================================== -->
- <!-- Placed at the end of the document so the pages load faster -->
- <script src="../../docs/assets/js/jquery.js"></script>
- <script src="../../docs/assets/js/bootstrap-transition.js"></script>
- <script src="../../docs/assets/js/bootstrap-alert.js"></script>
- <script src="../../docs/assets/js/bootstrap-modal.js"></script>
- <script src="../../docs/assets/js/bootstrap-dropdown.js"></script>
- <script src="../../docs/assets/js/bootstrap-scrollspy.js"></script>
- <script src="../../docs/assets/js/bootstrap-tab.js"></script>
- <script src="../../docs/assets/js/bootstrap-tooltip.js"></script>
- <script src="../../docs/assets/js/bootstrap-popover.js"></script>
- <script src="../../docs/assets/js/bootstrap-button.js"></script>
- <script src="../../docs/assets/js/bootstrap-collapse.js"></script>
- <script src="../../docs/assets/js/bootstrap-carousel.js"></script>
- <script src="../../docs/assets/js/bootstrap-typeahead.js"></script>
-
- </body>
-</html>
[3/3] git commit: updated refs/heads/master to 9b64526
Posted by ga...@apache.org.
Improved development server
Fauton: Much faster and simpler build server. Only updates changed files, uses
requirejs to load necessary dependancies.
Fixes COUCHDB-1846
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9b64526d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9b64526d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9b64526d
Branch: refs/heads/master
Commit: 9b64526db9e22de0c94fd6065186336ad423f4c0
Parents: 03d1b7e
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Jun 27 16:17:59 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jul 15 14:21:19 2013 +0200
----------------------------------------------------------------------
src/fauxton/Gruntfile.js | 83 +-
src/fauxton/app/api.js | 2 +-
src/fauxton/app/app.js | 1 -
src/fauxton/app/config.js | 3 +-
src/fauxton/app/main.js | 13 +-
src/fauxton/app/modules/documents/views.js | 2 +-
src/fauxton/assets/index.underscore | 4 +-
src/fauxton/assets/js/libs/require.js | 1112 +++++++--------
.../assets/less/bootstrap/tests/buttons.html | 139 --
.../assets/less/bootstrap/tests/css-tests.css | 139 --
.../assets/less/bootstrap/tests/css-tests.html | 1296 ------------------
.../less/bootstrap/tests/forms-responsive.html | 71 -
.../assets/less/bootstrap/tests/forms.html | 179 ---
.../less/bootstrap/tests/navbar-fixed-top.html | 104 --
.../less/bootstrap/tests/navbar-static-top.html | 107 --
.../assets/less/bootstrap/tests/navbar.html | 107 --
src/fauxton/package.json | 16 +-
src/fauxton/settings.json.default | 23 +-
src/fauxton/tasks/couchserver.js | 73 +-
src/fauxton/tasks/fauxton.js | 2 +-
src/fauxton/tasks/helper.js | 6 +-
21 files changed, 707 insertions(+), 2775 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 7c9d4ec..886272d 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -78,22 +78,33 @@ module.exports = function(grunt) {
theAssets.img.push(imgPath + "/**");
}
});
- grunt.log.write(theAssets.img[0]);
return theAssets;
}();
var templateSettings = function(){
var defaultSettings = {
- "src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
- "variables": {
- "assets_root": "./",
- "requirejs": "require.js",
- "base": null
+ "development": {
+ "src": "assets/index.underscore",
+ "dest": "dist/debug/index.html",
+ "variables": {
+ "requirejs": "/assets/js/libs/require.js",
+ "css": "./css/index.css",
+ "base": null
+ }
+ },
+ "release": {
+ "src": "assets/index.underscore",
+ "dest": "dist/debug/index.html",
+ "variables": {
+ "requirejs": "./js/require.js",
+ "css": "./css/index.css",
+ "base": null
+ }
}
};
+
var settings = helper.readSettingsFile();
- return {template: settings.template || defaultSettings};
+ return settings.template || defaultSettings;
}();
grunt.initConfig({
@@ -154,7 +165,7 @@ module.exports = function(grunt) {
// index.html.
concat: {
requirejs: {
- src: ["assets/js/libs/almond.js", "dist/debug/templates.js", "dist/debug/require.js"],
+ src: [ "assets/js/libs/require.js", "dist/debug/templates.js", "dist/debug/require.js"],
dest: "dist/debug/js/require.js"
},
@@ -206,8 +217,17 @@ module.exports = function(grunt) {
},
watch: {
- files: helper.watchFiles(["./app/**/*", "./assets/**/*"]),
- tasks: ['debug', 'template']
+ js: {
+ files: helper.watchFiles(['.js'], ["./app/**/*.js", '!./app/load_addons.js',"./assets/**/*.js"]),
+ tasks: ['watchRun'],
+ },
+ style: {
+ files: helper.watchFiles(['.less','.css'],["./app/**/*.css","./app/**/*.less","./assets/**/*.css", "./assets/**/*.less"]),
+ tasks: ['less', 'concat:index_css'],
+ },
+ options: {
+ nospawn: true,
+ }
},
requirejs: {
@@ -225,8 +245,8 @@ module.exports = function(grunt) {
// Do not wrap everything in an IIFE.
wrap: false,
- optimize: "none"
- }
+ optimize: "none",
+ }
}
},
@@ -294,6 +314,16 @@ module.exports = function(grunt) {
});
+ // on watch events configure jshint:all to only run on changed file
+ grunt.event.on('watch', function(action, filepath) {
+ if (!!filepath.match(/.js$/)) {
+ grunt.config(['jshint', 'all'], filepath);
+ }
+ /*} else if (!!filepath.match(/.css$|.less$/)) {
+ grunt.task.run(['less', 'concat:index_css']);
+ }*/
+ });
+
/*
* Load Grunt plugins
*/
@@ -302,11 +332,23 @@ module.exports = function(grunt) {
// Load the couchapp task
grunt.loadNpmTasks('grunt-couchapp');
// Load the copy task
- grunt.loadNpmTasks('grunt-contrib');
+ grunt.loadNpmTasks('grunt-contrib-watch');
// Load the exec task
grunt.loadNpmTasks('grunt-exec');
// Load Require.js task
- grunt.loadNpmTasks('grunt-requirejs');
+ grunt.loadNpmTasks('grunt-contrib-requirejs');
+ // Load Copy task
+ grunt.loadNpmTasks('grunt-contrib-copy');
+ // Load Clean task
+ grunt.loadNpmTasks('grunt-contrib-clean');
+ // Load jshint task
+ grunt.loadNpmTasks('grunt-contrib-jshint');
+ // Load jst task
+ grunt.loadNpmTasks('grunt-contrib-jst');
+ // Load less task
+ grunt.loadNpmTasks('grunt-contrib-less');
+ // Load concat task
+ grunt.loadNpmTasks('grunt-contrib-concat');
// Load UglifyJS task
grunt.loadNpmTasks('grunt-contrib-uglify');
// Load CSSMin task
@@ -326,7 +368,7 @@ module.exports = function(grunt) {
// Fetch dependencies (from git or local dir), lint them and make load_addons
grunt.registerTask('dependencies', ['get_deps', 'jshint', 'gen_load_addons:default']);
// build templates, js and css
- grunt.registerTask('build', ['jst', 'requirejs', 'concat:requirejs', 'less', 'concat:index_css', 'template']);
+ grunt.registerTask('build', ['less', 'concat:index_css', 'jst', 'requirejs', 'concat:requirejs', 'template:release']);
// minify code and css, ready for release.
grunt.registerTask('minify', ['uglify', 'cssmin:compress']);
@@ -334,9 +376,12 @@ module.exports = function(grunt) {
* Build the app in either dev, debug, or release mode
*/
// dev server
- grunt.registerTask('dev', ['debug', 'couchserver']);
+ grunt.registerTask('dev', ['debugDev', 'couchserver']);
// build a debug release
- grunt.registerTask('debug', ['test', 'dependencies', 'build', 'copy:debug']);
+ grunt.registerTask('debug', ['test', 'dependencies', 'concat:requirejs','less', 'concat:index_css', 'template:development', 'copy:debug']);
+ grunt.registerTask('debugDev', ['test', 'dependencies', 'less', 'concat:index_css', 'template:development', 'copy:debug']);
+
+ grunt.registerTask('watchRun', ['dependencies']);
// build a release
grunt.registerTask('release', ['test' ,'dependencies', 'build', 'minify', 'copy:dist']);
@@ -348,7 +393,7 @@ module.exports = function(grunt) {
// make a minimized install that is server by mochiweb under _utils
grunt.registerTask('couchdb', ['release', 'copy:couchdb']);
// make an install that can be deployed as a couchapp
- grunt.registerTask('couchapp_setup', ['build', 'minify', 'copy:dist']);
+ grunt.registerTask('couchapp_setup', ['release']);
// install fauxton as couchapp
grunt.registerTask('couchapp_install', ['rmcouchdb:fauxton', 'mkcouchdb:fauxton', 'couchapp:fauxton']);
// setup and install fauxton as couchapp
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/app/api.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/api.js b/src/fauxton/app/api.js
index 4732528..0f3923e 100644
--- a/src/fauxton/app/api.js
+++ b/src/fauxton/app/api.js
@@ -78,7 +78,7 @@ function(app, Fauxton) {
}
return $.when(deferreds);
- },
+ };
FauxtonAPI.addRoute = function(route) {
app.router.route(route.route, route.name, route.callback);
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/app/app.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/app.js b/src/fauxton/app/app.js
index be0136d..df0894a 100644
--- a/src/fauxton/app/app.js
+++ b/src/fauxton/app/app.js
@@ -56,7 +56,6 @@ function($, _, Backbone, Helpers) {
} else {
// Put fetch into `async-mode`.
done = this.async();
-
// Seek out the template asynchronously.
return $.ajax({ url: app.root + path }).then(function(contents) {
done(JST[path] = _.template(contents));
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/app/config.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/config.js b/src/fauxton/app/config.js
index c7ae1d6..d7d3b40 100644
--- a/src/fauxton/app/config.js
+++ b/src/fauxton/app/config.js
@@ -20,6 +20,8 @@ require.config({
"nv.d3": "../assets/js/libs/nv.d3"
},
+ baseUrl: '/',
+
shim: {
// Backbone library depends on lodash and jQuery.
backbone: {
@@ -51,5 +53,4 @@ require.config({
"plugins/jquery.form": ["jquery"]
}
-
});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/app/main.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/main.js b/src/fauxton/app/main.js
index 2f8f8fa..c06b0c4 100644
--- a/src/fauxton/app/main.js
+++ b/src/fauxton/app/main.js
@@ -23,16 +23,7 @@ function(app, Router) {
// Get the absolute root.
var root = location.protocol + "//" + location.host + app.root;
- // Ensure the root is part of the anchor href, meaning it's relative.
- if (href.prop && href.prop.slice(0, root.length) === root) {
- // Stop the default event to ensure the link will not cause a page
- // refresh.
- evt.preventDefault();
-
- // `Backbone.history.navigate` is sufficient for all Routers and will
- // trigger the correct events. The Router's internal `navigate` method
- // calls this anyways. The fragment is sliced from the root.
- Backbone.history.navigate(href.attr, true);
- }
+ evt.preventDefault();
+ Backbone.history.navigate(href.attr, true);
});
});
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index 59e3b7d..6c92cfa 100644
--- a/src/fauxton/app/modules/documents/views.js
+++ b/src/fauxton/app/modules/documents/views.js
@@ -764,7 +764,7 @@ function(app, FauxtonAPI, Documents, pouchdb, Codemirror, JSHint) {
var that = this,
promise,
- viewName = this.$('#index-name').val();
+ viewName = this.$('#index-name').val(),
ddocName = this.$('#ddoc :selected').val(),
ddoc = this.getCurrentDesignDoc();
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9b64526d/src/fauxton/assets/index.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/index.underscore b/src/fauxton/assets/index.underscore
index e29b4c4..7ccb930 100644
--- a/src/fauxton/assets/index.underscore
+++ b/src/fauxton/assets/index.underscore
@@ -24,7 +24,7 @@
<title>Project Fauxton</title>
<!-- Application styles. -->
- <link rel="stylesheet" href="<%= assets_root %>css/index.css">
+ <link rel="stylesheet" href="<%= css %>">
<style type="text/css">
body {
padding-top: 60px;
@@ -49,6 +49,6 @@
</div>
<!-- Application source. -->
- <script data-main="/app/config" src="<%= assets_root %>js/<%= requirejs %>"></script>
+ <script data-main="/config" src="<%= requirejs %>"></script>
</body>
</html>