reverted jshint rules, cleaned up source where it was failing. updating build process errors. TODO: fix livereload

This commit is contained in:
Nelson Omuto 2014-10-03 16:46:56 -04:00
parent 5d3d2fd307
commit 5249da3197
12 changed files with 78 additions and 18 deletions

View File

@ -1,5 +1,6 @@
{
"bitwise": true,
"camelcase": true,
"curly": true,
"eqeqeq": false,
"es3": false,
@ -14,6 +15,7 @@
"nonbsp": true,
"nonew": true,
"plusplus": false,
"quotmark": "double",
"undef": true,
"unused": true,
"strict": false,

View File

@ -67,8 +67,7 @@ module.exports = function(grunt) {
options: {
port: 8040,
hostname: "localhost",
livereload: 35740,
keepalive: true
livereload: 35741
},
livereload: {
@ -126,6 +125,14 @@ module.exports = function(grunt) {
files: ["test/**/*.js"],
tasks: ["newer:jshint:test", "jasmine"]
},
less: {
files:["less/**/*.less"],
tasks: ["default"]
},
sass: {
files: ["sass/**/*.scss", "sass/**/*.sass"],
tasks: ["scss"]
},
livereload: {
options: {
livereload: "<%= connect.options.livereload %>"
@ -155,7 +162,7 @@ module.exports = function(grunt) {
grunt.registerTask("test", [
"jasmine:scripts:build",
"connect:test"
"connect:test:keepalive"
]);
grunt.registerTask("serve", function(target){

43
_SpecRunner.html Normal file
View File

@ -0,0 +1,43 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<title>Jasmine Spec Runner</title>
<link rel="shortcut icon" type="image/png" href=".grunt/grunt-contrib-jasmine/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href=".grunt/grunt-contrib-jasmine/jasmine.css">
</head>
<body>
<script src=".grunt/grunt-contrib-jasmine/es5-shim.js"></script>
<script src=".grunt/grunt-contrib-jasmine/jasmine.js"></script>
<script src=".grunt/grunt-contrib-jasmine/jasmine-html.js"></script>
<script src=".grunt/grunt-contrib-jasmine/json2.js"></script>
<script src=".grunt/grunt-contrib-jasmine/boot.js"></script>
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
<script src="test/*Helper.js"></script>
<script src="scripts/material.js"></script>
<script src="scripts/ripples.js"></script>
<script src="test/materialSpec.js"></script>
<script src="test/ripplesSpec.js"></script>
<script src=".grunt/grunt-contrib-jasmine/reporter.js"></script>
</body>
</html>

View File

@ -2365,6 +2365,9 @@ fieldset[disabled] .navbar .btn-link:focus {
.dropdown-menu li a:hover {
background: rgba(0, 0, 0, 0.08);
}
div {
background-color: black;
}
.alert {
border: 0px;
border-radius: 0;

File diff suppressed because one or more lines are too long

View File

@ -2364,6 +2364,9 @@ fieldset[disabled] .navbar .btn-link:focus {
.dropdown-menu li a:hover {
background: rgba(0, 0, 0, 0.08);
}
div {
background-color: black;
}
.alert {
border: 0px;
border-radius: 0;

File diff suppressed because one or more lines are too long

View File

@ -1,5 +1,7 @@
// main: material.less
div {
background-color: black;
}
.alert {
border: 0px;
border-radius: 0;

View File

@ -6,11 +6,11 @@ window.ripples = {
"use strict";
// Cross browser matches function
function matchesSelector(dom_element, selector) {
var matches = dom_element.matches || dom_element.matchesSelector || dom_element.webkitMatchesSelector ||
dom_element.mozMatchesSelector ||
dom_element.msMatchesSelector || dom_element.oMatchesSelector;
return matches.call(dom_element, selector);
function matchesSelector(domElement, selector) {
var matches = domElement.matches || domElement.matchesSelector || domElement.webkitMatchesSelector ||
domElement.mozMatchesSelector ||
domElement.msMatchesSelector || domElement.oMatchesSelector;
return matches.call(domElement, selector);
}
// animations time

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,11 +6,11 @@ window.ripples = {
"use strict";
// Cross browser matches function
function matchesSelector(dom_element, selector) {
var matches = dom_element.matches || dom_element.matchesSelector || dom_element.webkitMatchesSelector ||
dom_element.mozMatchesSelector ||
dom_element.msMatchesSelector || dom_element.oMatchesSelector;
return matches.call(dom_element, selector);
function matchesSelector(domElement, selector) {
var matches = domElement.matches || domElement.matchesSelector || domElement.webkitMatchesSelector ||
domElement.mozMatchesSelector ||
domElement.msMatchesSelector || domElement.oMatchesSelector;
return matches.call(domElement, selector);
}
// animations time