Permalink
Browse files

code cleanups, re-pointed to upstream node-XMLHttpRequest, added a ha…

…cked .csslintrc file, removed Aero device, removed ripple/config module
  • Loading branch information...
1 parent cfc7b85 commit 15815c5ab09f6aa1cc777260fab14b8340f4d255 @brentlintner brentlintner committed Aug 27, 2011
View
@@ -0,0 +1,22 @@
+[
+ "unique-headings",
+ "qualified-headings",
+ "ids",
+ "font-sizes",
+ "floats",
+ "overqualified-elements",
+ "zero-units",
+ "universal-selector",
+ "regex-selectors",
+ "import",
+ "font-faces",
+ "vendor-prefix",
+ "text-indent",
+ "gradients",
+ "compatible-vendor-prefixes",
+ "adjoining-classes",
+ "known-properties",
+ "empty-rules",
+ "duplicate-properties",
+ "display-property-grouping"
+]
View
@@ -3,7 +3,7 @@
url = http://github.com/pivotal/jasmine.git
[submodule "thirdparty/node-XMLHttpRequest"]
path = thirdparty/node-XMLHttpRequest
- url = http://github.com/tinyhippos/node-XMLHttpRequest.git
+ url = http://github.com/driverdan/node-XMLHttpRequest.git
[submodule "thirdparty/browser-require"]
path = thirdparty/browser-require
url = https://github.com/rsms/browser-require.git
View
@@ -30,7 +30,7 @@ task('test', [], function () {
desc("boot test server for running all tests in the browser");
task('btest', [], require('./build/btest'));
-desc("runs jshint - jake lint [path1,path2]");
+desc("runs jshint + csslint - jake lint [path1,path2]");
task('lint', [], function () {
require('./build/lint')(complete, Array.prototype.slice.call(arguments));
}, true);
View
@@ -14,16 +14,24 @@
* limitations under the License.
*/
module.exports = function () {
- var express = require('express'),
- connect = require('connect'),
+ var connect = require('connect'),
fs = require('fs'),
sys = require('sys'),
utils = require('./build/utils'),
libs = [],
tests = [],
- app = express.createServer(
+ app = connect(
connect.static(__dirname + "/../lib/"),
- connect.static(__dirname + "/../")
+ connect.static(__dirname + "/../"),
+ connect.router(function (app) {
+ app.get('/', function (req, res) {
+ res.writeHead(200, {
+ "Cache-Control": "no-cache",
+ "Content-Type": "text/html"
+ });
+ res.end(doc);
+ });
+ })
),
html = fs.readFileSync(__dirname + "/btest/test.html", "utf-8"),
doc, modules, specs;
@@ -45,11 +53,6 @@ module.exports = function () {
doc = html.replace(/<!-- SPECS -->/g, specs).replace(/"##FILES##"/g, modules);
- app.get('/', function (req, res) {
- res.header("Cache-Control", "no-cache");
- res.send(doc);
- });
-
app.listen(3000);
sys.puts("Test Server running on:");
View
@@ -26,7 +26,6 @@ module.exports = function () {
src = {
info: JSON.parse(fs.readFileSync(_c.PACKAGE_JSON, "utf-8")),
js: "",
- injection: "",
overlays: "",
panels: "",
html: "",
View
@@ -13,17 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-module.exports = function (done, files) {
- var args = files && files.length > 0 ? files : ["."],
- options = ["--reporter", "build/lint/reporter.js", "--show-non-errors"],
- spawn = require('child_process').spawn,
- cmd = spawn('jshint', args.concat(options)),
- sys = require('sys');
+var childProcess = require('child_process'),
+ sys = require('sys'),
+ fs = require('fs');
+function _spawn(proc, args, done) {
+ var cmd = childProcess.spawn(proc, args);
cmd.stdout.on('data', sys.print);
cmd.stderr.on('data', sys.print);
-
if (done) {
cmd.on('exit', done);
}
+}
+
+function _lintJS(files, done) {
+ var options = ["--reporter", "build/lint/reporter.js", "--show-non-errors"];
+ _spawn('jshint', files.concat(options), done);
+}
+
+function _lintCSS(files, done) {
+ var rules = JSON.parse(fs.readFileSync(__dirname + "/../.csslintrc", "utf-8")),
+ options = ["--rules=" + rules, "--format=compact", "ext", "lib", "test"];
+ _spawn('csslint', files.concat(options), done);
+}
+
+module.exports = function (done, files) {
+ _lintJS(files && files.length > 0 ? files : ["."], function () {
+ _lintCSS(files && files.length > 0 ? files : ["ext", "lib", "test"], done);
+ });
};
View
@@ -1,4 +1,4 @@
npm install -g jake jshint uglify-js
-npm install jsdom sinon jasmine-node jWorkflow connect express argsparser
+npm install jsdom sinon jasmine-node jWorkflow connect argsparser
git submodule init
git submodule update
View
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
-->
+<!DOCTYPE html>
<html>
<head>
<link href="#URL_PREFIX#styles/main.css" type="text/css" rel="stylesheet" />
@@ -41,20 +41,20 @@ textarea:focus, input:focus {
color: #333333;
}
-p:first-letter, th, li:first-letter, label, button, h1, h2, h3{ text-transform: capitalize; }
+p:first-letter, th, li:first-letter, label, button { text-transform: capitalize; }
-h1{ font-size: 2em; font-weight: bold; }
+h1 { font-size: 2em; font-weight: bold; text-transform: capitalize; }
-h2{ font-size: 1em; font-weight: bold;}
+h2 { font-size: 1em; font-weight: bold; text-transform: capitalize; }
-h3{ font-style: italic; font-size: 1.07em; font-weight: normal; }
+h3 { font-style: italic; font-size: 1.07em; font-weight: normal; text-transform: capitalize; }
.irrelevant{ display: none; }
hr { color: #1e1e1e; }
.popup-body {
- width:300px;
+ width: 300px;
padding: 0 .5em;
}
Oops, something went wrong.

0 comments on commit 15815c5

Please sign in to comment.