couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject [21/21] git commit: updated refs/heads/1846-dev-server-improvements to 5da4bbf
Date Mon, 08 Jul 2013 16:00:14 GMT
dev and release working except images


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5da4bbf0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5da4bbf0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5da4bbf0

Branch: refs/heads/1846-dev-server-improvements
Commit: 5da4bbf007efc33caad9b379e405a04637c6841e
Parents: 12761a8
Author: Garren Smith <garren.smith@gmail.com>
Authored: Mon Jul 8 16:56:30 2013 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Mon Jul 8 17:41:35 2013 +0200

----------------------------------------------------------------------
 src/fauxton/Gruntfile.js                        |   11 +-
 src/fauxton/app/addons/stats/base.js            |    3 +-
 src/fauxton/app/app.js                          |    1 -
 src/fauxton/app/config.js                       |    8 +-
 src/fauxton/app/main.js                         |   11 +-
 .../js/plugins/require-css/example/build.js     |   31 -
 .../js/plugins/require-css/example/setup.sh     |    5 -
 .../js/plugins/require-css/example/test.html    |   30 -
 .../js/plugins/require-css/example/www/app.js   |    4 -
 .../example/www/components/component.css        |    5 -
 .../example/www/components/component.js         |    3 -
 .../require-css/example/www/components/test.css |    3 -
 .../plugins/require-css/example/www/jquery.js   | 9404 ------------------
 .../plugins/require-css/example/www/popup.css   |    7 -
 .../js/plugins/require-css/example/www/popup.js |    3 -
 .../plugins/require-css/example/www/require-css |    1 -
 .../require-css/example/www/style/style.css     |    6 -
 .../js/plugins/require-css/example/www/test.css |    3 -
 .../plugins/require-css/example/www/test.html   |   28 -
 .../js/plugins/require-css/example/www/text.js  |  282 -
 .../assets/js/plugins/require-css/test/test.js  |   78 -
 .../js/plugins/require-less/example/build.js    |   30 -
 .../js/plugins/require-less/example/setup.sh    |    3 -
 .../js/plugins/require-less/example/test.html   |   29 -
 .../js/plugins/require-less/example/www/app.js  |    3 -
 .../example/www/components/component.js         |    3 -
 .../example/www/components/component.less       |    5 -
 .../require-less/example/www/css-style.css      |    3 -
 .../example/www/less-style/style.less           |    4 -
 .../example/www/less-style/test.less            |    1 -
 .../require-less/example/www/require-css        |    1 -
 .../require-less/example/www/require-less       |    1 -
 .../plugins/require-less/example/www/test.html  |   29 -
 .../js/plugins/require-less/example/www/text.js |  282 -
 .../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/couchapp.js                         |    2 +-
 src/fauxton/tasks/couchserver.js                |   11 +-
 44 files changed, 21 insertions(+), 12455 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index 7299ced..9e22a2c 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -78,7 +78,6 @@ module.exports = function(grunt) {
         theAssets.img.push(imgPath + "/**");
       }
     });
-    grunt.log.write(theAssets.img[0]);
     return theAssets;
   }();
 
@@ -218,9 +217,7 @@ module.exports = function(grunt) {
     },
 
     watch: {
-      files: helper.watchFiles(["./app/**/*", "./assets/**/*", '!./app/load_addons.js']),
-      tasks: ['watchRun']
-      files: ['./app/**/*', ≈],
+      files: helper.watchFiles(["./app/**/*", '!./app/load_addons.js',"./assets/**/*"]),
       tasks: ['watchRun'],
       options: {
         nospawn: true,
@@ -244,7 +241,6 @@ module.exports = function(grunt) {
           wrap: false,
           optimize: "none",
 
-          excludeShallow: ['css/css-builder', 'less/lessc-server', 'less/lessc'],
           include: ['css']
         }
       }
@@ -286,6 +282,7 @@ module.exports = function(grunt) {
       dist:{
         files:[
           {src: "dist/debug/index.html", dest: "dist/release/index.html"},
+          {src: "dist/debug/js/require.js", dest: "dist/release/js/require.js"},
           {src: assets.img, dest: "dist/release/img/", flatten: true, expand: true}
         ]
       },
@@ -318,6 +315,8 @@ module.exports = function(grunt) {
   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']);
     }
   });
 
@@ -378,7 +377,7 @@ module.exports = function(grunt) {
   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', ['jshint', 'dependencies' ]);
+  grunt.registerTask('watchRun', ['dependencies']);
   // build a release
   grunt.registerTask('release', ['test' ,'dependencies', 'build', 'copy:dist']);
 

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/app/addons/stats/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/stats/base.js b/src/fauxton/app/addons/stats/base.js
index 3fcfb48..4721399 100644
--- a/src/fauxton/app/addons/stats/base.js
+++ b/src/fauxton/app/addons/stats/base.js
@@ -13,8 +13,7 @@
 define([
   "app",
   "api",
-  "addons/stats/routes",
-  'less!addons/stats/assets/less/stats'
+  "addons/stats/routes"
 ],
 
 function(app, FauxtonAPI, Stats) {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/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/5da4bbf0/src/fauxton/app/config.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/config.js b/src/fauxton/app/config.js
index 76075d7..8fc7efe 100644
--- a/src/fauxton/app/config.js
+++ b/src/fauxton/app/config.js
@@ -52,13 +52,13 @@ require.config({
     "plugins/jquery.form": ["jquery"]
   },
 
-  /*map: {
+  map: {
     '*': {
     'css': '../assets/js/plugins/require-css/css'
     }
-    },*/
+    },
 
-  packages: [
+  /*packages: [
     {
     name: 'css',
     location: '../assets/js/plugins/require-css',
@@ -69,6 +69,6 @@ require.config({
     location: '../assets/js/plugins/require-less',
     main: 'less'
   }
-  ]
+  ]*/
 
 });

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/app/main.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/main.js b/src/fauxton/app/main.js
index c94f446..b17ea5a 100644
--- a/src/fauxton/app/main.js
+++ b/src/fauxton/app/main.js
@@ -1,7 +1,7 @@
 require([
-  'css!/css/index',
-  // Application.
-  "app",
+        'css!../dist/debug/css/index',
+        // Application.
+        "app",
 
         // Main Router.
         "router"
@@ -24,8 +24,7 @@ function(indexCSS, app, Router) {
     // Get the absolute root.
     var root = location.protocol + "//" + location.host + app.root;
 
-      evt.preventDefault();
-      Backbone.history.navigate(href.attr, true);
-    }
+    evt.preventDefault();
+    Backbone.history.navigate(href.attr, true);
   });
 });

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/build.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/build.js b/src/fauxton/assets/js/plugins/require-css/example/build.js
deleted file mode 100644
index 1dba1dc..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/build.js
+++ /dev/null
@@ -1,31 +0,0 @@
-({
-  appDir: 'www',
-  dir: 'www-built',
-  baseUrl: '.',
-  fileExclusionRegExp: /(^example)|(.git)$/,
-  //separateCSS: true,
-  optimizeCss: "node",
-  map: {
-    '*': {
-      css: 'require-css/css'
-    }
-  },
-  modules: [
-  {
-    name: 'app',
-    exclude: ['core-components'],
-  },
-  {
-    name: 'core-components',
-    separateCSS: true,
-    create: true,
-    include: ['components/component'], 
-  },
-  {
-    name: 'popup',
-    exclude: ['core-components']
-  }
-  ]
-  //name: 'app.js',
-  //out: 'app-built.js'
-})

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/setup.sh
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/setup.sh b/src/fauxton/assets/js/plugins/require-css/example/setup.sh
deleted file mode 100755
index 8d188ab..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/setup.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# build the symlink to require-css. done by script as it breaks project builds
-cd www
-ln -s ../../ require-css

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/test.html
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/test.html b/src/fauxton/assets/js/plugins/require-css/example/test.html
deleted file mode 100644
index dcb38d1..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/test.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!doctype html>
-<html>
-<script type='text/javascript' src='../../../require.js'></script>
-<script>
-  require.config({
-    baseUrl: '/Users/guybedford/Projects/OpenClient/www/lib/require-css/example/www-built/',
-    map: {
-      '*': {
-        'css': 'require-css/css'
-      } 
-    }
-  });
-</script>
-<link rel='stylesheet' href='core-components.css'></link>
-<script src='core-components.js'></script>
-
-<body>
-<h1>test</h1>
-</body>
-
-
-<script>
-  require(['app'], function(){});
-  require(['popup'], function(popupHTML) {
-    var div = document.createElement('div');
-    div.innerHTML = popupHTML;
-    document.body.appendChild(div);
-    alert(div.childNodes[0].offsetWidth == 340 ? 'Style query passed' : 'Style query failed');
-  });
-</script>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/www/app.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/www/app.js b/src/fauxton/assets/js/plugins/require-css/example/www/app.js
deleted file mode 100755
index 31b28c1..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/www/app.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/* nb css form below implies inline style in js file for automatic injection */
-define(['css!style/style', 'components/component'], function(component) {
-  return 'uses the component!';
-});

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/www/components/component.css
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/www/components/component.css
b/src/fauxton/assets/js/plugins/require-css/example/www/components/component.css
deleted file mode 100755
index cc67e7c..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/www/components/component.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* component.css */
-@import 'test.css';
-body {
-  background-image: url(../test.jpg);
-}

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/www/components/component.js
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/www/components/component.js
b/src/fauxton/assets/js/plugins/require-css/example/www/components/component.js
deleted file mode 100755
index 0e45eae..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/www/components/component.js
+++ /dev/null
@@ -1,3 +0,0 @@
-define(['css!./component'], function() {
-  return {component: 'is here'};
-});

http://git-wip-us.apache.org/repos/asf/couchdb/blob/5da4bbf0/src/fauxton/assets/js/plugins/require-css/example/www/components/test.css
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/js/plugins/require-css/example/www/components/test.css b/src/fauxton/assets/js/plugins/require-css/example/www/components/test.css
deleted file mode 100644
index 4d92b31..0000000
--- a/src/fauxton/assets/js/plugins/require-css/example/www/components/test.css
+++ /dev/null
@@ -1,3 +0,0 @@
-body {
-  border: 1px solid #555;
-}


Mime
View raw message