Skip to content

Commit

Permalink
Changed Travis CI setup to launch jshint and tests using grunt (for c…
Browse files Browse the repository at this point in the history
…onsistency with other modules, esp. using jshint 2.4) + fixed som jshint errors ignored by jshint 2.5.
  • Loading branch information
edurocher committed May 16, 2014
1 parent d2cf202 commit 49992a4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 11 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Expand Up @@ -6,10 +6,9 @@ env:
language: node_js
node_js: 0.10
install:
- npm -g install jshint
- npm -g install bower
- npm install -g grunt-cli
- npm install -g bower
- npm install
- bower install
script:
- jshint .
- node node_modules/intern/runner.js config=tests/intern
- grunt jshint test:remote
8 changes: 4 additions & 4 deletions svg/Shape.js
Expand Up @@ -454,17 +454,17 @@ define([
// An SVG mask to apply to this shape. See gfx/svg/Mask.
mask: null,

_setMaskAttr: function(/*gfx/svg/Mask*/mask){
_setMaskAttr: function (/*gfx/svg/Mask*/mask) {
// summary:
// Sets a mask object (SVG)
// mask:
// The mask object

var rawNode = this.rawNode;
if(mask){
rawNode.setAttribute("mask", "url(#"+mask.shape.id+")");
if (mask) {
rawNode.setAttribute("mask", "url(#" + mask.shape.id + ")");
this._set("mask", mask);
}else{
} else {
rawNode.removeAttribute("mask");
this._set("mask", null);
}
Expand Down
6 changes: 3 additions & 3 deletions utils.js
@@ -1,6 +1,6 @@
define([
"dojo/_base/kernel", "dojo/_base/lang", "./_base", "dojo/_base/window", "dojo/Deferred",
"dojo/_base/sniff", "require", "dojo/_base/config", "dcl/dcl"
"dojo/_base/kernel", "dojo/_base/lang", "./_base", "dojo/_base/window", "dojo/Deferred", "dojo/_base/sniff",
"require", "dojo/_base/config", "dcl/dcl"
], function (kernel, lang, g, win, Deferred, has, require, config, dcl) {
var gu = g.utils = {};

Expand Down Expand Up @@ -102,7 +102,7 @@ define([
// Indicates whether the output string should be formatted.
// returns: String

return JSON.stringify(gu.serialize(object), prettyPrint?"\t":null); // String
return JSON.stringify(gu.serialize(object), prettyPrint ? "\t" : null); // String
},

deserialize: function (parent, object) {
Expand Down

0 comments on commit 49992a4

Please sign in to comment.