Skip to content

Commit 720479c

Browse files
nelsonomutonelsonomuto
committed
reverted jshint rules, cleaned up source where it was failing. updating build process errors. TODO: fix livereload
1 parent 82aae6f commit 720479c

12 files changed

Lines changed: 78 additions & 18 deletions

File tree

‎.jshintrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"bitwise": true,
3+
"camelcase": true,
34
"curly": true,
45
"eqeqeq": false,
56
"es3": false,
@@ -14,6 +15,7 @@
1415
"nonbsp": true,
1516
"nonew": true,
1617
"plusplus": false,
18+
"quotmark": "double",
1719
"undef": true,
1820
"unused": true,
1921
"strict": false,

‎Gruntfile.js‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ module.exports = function(grunt) {
6767
options: {
6868
port: 8040,
6969
hostname: "localhost",
70-
livereload: 35740,
71-
keepalive: true
70+
livereload: 35741
7271

7372
},
7473
livereload: {
@@ -126,6 +125,14 @@ module.exports = function(grunt) {
126125
files: ["test/**/*.js"],
127126
tasks: ["newer:jshint:test", "jasmine"]
128127
},
128+
less: {
129+
files:["less/**/*.less"],
130+
tasks: ["default"]
131+
},
132+
sass: {
133+
files: ["sass/**/*.scss", "sass/**/*.sass"],
134+
tasks: ["scss"]
135+
},
129136
livereload: {
130137
options: {
131138
livereload: "<%= connect.options.livereload %>"
@@ -155,7 +162,7 @@ module.exports = function(grunt) {
155162

156163
grunt.registerTask("test", [
157164
"jasmine:scripts:build",
158-
"connect:test"
165+
"connect:test:keepalive"
159166
]);
160167

161168
grunt.registerTask("serve", function(target){

‎_SpecRunner.html‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!doctype html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<title>Jasmine Spec Runner</title>
6+
<link rel="shortcut icon" type="image/png" href=".grunt/grunt-contrib-jasmine/jasmine_favicon.png">
7+
8+
<link rel="stylesheet" type="text/css" href=".grunt/grunt-contrib-jasmine/jasmine.css">
9+
10+
11+
</head>
12+
<body>
13+
14+
15+
<script src=".grunt/grunt-contrib-jasmine/es5-shim.js"></script>
16+
17+
<script src=".grunt/grunt-contrib-jasmine/jasmine.js"></script>
18+
19+
<script src=".grunt/grunt-contrib-jasmine/jasmine-html.js"></script>
20+
21+
<script src=".grunt/grunt-contrib-jasmine/json2.js"></script>
22+
23+
<script src=".grunt/grunt-contrib-jasmine/boot.js"></script>
24+
25+
<script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
26+
27+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
28+
29+
<script src="test/*Helper.js"></script>
30+
31+
<script src="scripts/material.js"></script>
32+
33+
<script src="scripts/ripples.js"></script>
34+
35+
<script src="test/materialSpec.js"></script>
36+
37+
<script src="test/ripplesSpec.js"></script>
38+
39+
<script src=".grunt/grunt-contrib-jasmine/reporter.js"></script>
40+
41+
42+
</body>
43+
</html>

‎css-compiled/material-wfont.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,6 +2365,9 @@ fieldset[disabled] .navbar .btn-link:focus {
23652365
.dropdown-menu li a:hover {
23662366
background: rgba(0, 0, 0, 0.08);
23672367
}
2368+
div {
2369+
background-color: black;
2370+
}
23682371
.alert {
23692372
border: 0px;
23702373
border-radius: 0;

‎css-compiled/material-wfont.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎css-compiled/material.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,6 +2364,9 @@ fieldset[disabled] .navbar .btn-link:focus {
23642364
.dropdown-menu li a:hover {
23652365
background: rgba(0, 0, 0, 0.08);
23662366
}
2367+
div {
2368+
background-color: black;
2369+
}
23672370
.alert {
23682371
border: 0px;
23692372
border-radius: 0;

‎css-compiled/material.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎less/_alerts.less‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// main: material.less
2-
2+
div {
3+
background-color: black;
4+
}
35
.alert {
46
border: 0px;
57
border-radius: 0;

‎scripts/ripples.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ window.ripples = {
66
"use strict";
77

88
// Cross browser matches function
9-
function matchesSelector(dom_element, selector) {
10-
var matches = dom_element.matches || dom_element.matchesSelector || dom_element.webkitMatchesSelector ||
11-
dom_element.mozMatchesSelector ||
12-
dom_element.msMatchesSelector || dom_element.oMatchesSelector;
13-
return matches.call(dom_element, selector);
9+
function matchesSelector(domElement, selector) {
10+
var matches = domElement.matches || domElement.matchesSelector || domElement.webkitMatchesSelector ||
11+
domElement.mozMatchesSelector ||
12+
domElement.msMatchesSelector || domElement.oMatchesSelector;
13+
return matches.call(domElement, selector);
1414
}
1515

1616
// animations time

‎template/material/css-compiled/material-wfont.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)