Skip to content

Commit

Permalink
jshint
Browse files Browse the repository at this point in the history
  • Loading branch information
cjolif committed Oct 22, 2013
1 parent 89374e2 commit 7ec2647
Show file tree
Hide file tree
Showing 9 changed files with 635 additions and 529 deletions.
73 changes: 73 additions & 0 deletions .jshintrc
@@ -0,0 +1,73 @@
{
"asi": false,
"bitwise": false,
"boss": false,
"browser": true,
"camelcase": true,
"couch": false,
"curly": true,
"debug": false,
"devel": true,
"dojo": false,
"eqeqeq": true,
"eqnull": true,
"es3": false,
"esnext": false,
"evil": false,
"expr": true,
"forin": false,
"funcscope": true,
"gcl": false,
"globalstrict": false,
"immed": true,
"iterator": false,
"jquery": false,
"lastsemic": false,
"latedef": false,
"laxbreak": true,
"laxcomma": false,
"loopfunc": true,
"mootools": false,
"moz": false,
"multistr": false,
"newcap": true,
"noarg": true,
"node": false,
"noempty": false,
"nonew": true,
"nonstandard": false,
"nomen": false,
"onecase": false,
"onevar": false,
"passfail": false,
"phantom": false,
"plusplus": false,
"proto": false,
"prototypejs": false,
"regexdash": true,
"regexp": false,
"rhino": false,
"scripturl": true,
"shadow": false,
"shelljs": false,
"smarttabs": true,
"strict": false,
"sub": false,
"supernew": false,
"trailing": true,
"undef": true,
"unused": true,
"validthis": true,
"withstmt": false,
"white": true,
"worker": false,
"wsh": false,
"yui": false,

"maxlen": 120,
"indent": 4,
"maxerr": 250,
"predef": [ "require", "define" ],
"quotmark": "double",
"maxcomplexity": 10
}
4 changes: 4 additions & 0 deletions .travis.yml
@@ -0,0 +1,4 @@
language: node_js
node_js: "0.10"
install: "npm -g install jshint"
script: "jshint ."
63 changes: 39 additions & 24 deletions DrillDownUp.js
@@ -1,42 +1,42 @@
define(["dojo/_base/lang", "dojo/_base/event", "dcl/dcl", "dojo/on", "dojo/dom-geometry", "dojo/dom-construct",
"dojo/dom-style", "dojo/_base/fx", "dojo/has!touch?dojox/gesture/tap"],
function(lang, event, dcl, on, domGeom, domConstruct, domStyle, fx, tap){
function (lang, event, dcl, on, domGeom, domConstruct, domStyle, fx, tap) {

return dcl(null, {
// summary:
// Specializes TreeMap to support drill down and up operations.

postCreate: function(){
postCreate: function () {
this.own(on(this, "dblclick", lang.hitch(this, this._onDoubleClick)));
if(tap){
if (tap) {
this.own(on(this, tap.doubletap, lang.hitch(this, this._onDoubleClick)));
}
},

_onDoubleClick: function(e){
_onDoubleClick: function (e) {
var renderer = this._getRendererFromTarget(e.target);
if(renderer.item){
if (renderer.item) {
var item = renderer.item;
if(this._isLeaf(item)){
if (this._isLeaf(item)) {
// walk up
item = renderer.parentItem;
renderer = this.itemToRenderer[this.getIdentity(item)];
// our leaf parent is the root, we can't do much...
if(renderer == null){
if (renderer == null) {
return;
}
}
// Drill up
if(this.rootItem == item){
if (this.rootItem === item) {
this.drillUp(renderer);
}else{
} else {
this.drillDown(renderer);
}
event.stop(e);
}
},

drillUp: function(renderer){
drillUp: function (renderer) {
// summary:
// Drill up from the given renderer.
// renderer: DomNode
Expand All @@ -61,26 +61,33 @@ define(["dojo/_base/lang", "dojo/_base/event", "dcl/dcl", "dojo/on", "dojo/dom-g
var corner = domGeom.getMarginBox(this);

fx.animateProperty({
node: renderer, duration: 500, properties: {
node: renderer,
duration: 500,
properties: {
left: {
end: finalBox.x - corner.l
}, top: {
},
top: {
end: finalBox.y - corner.t
}, height: {
},
height: {
end: finalBox.h
}, width: {
},
width: {
end: finalBox.w
}
}, onAnimate: lang.hitch(this, function(values){
},
onAnimate: lang.hitch(this, function () {
var box = domGeom.getContentBox(renderer);
this._layoutGroupContent(renderer, box.w, box.h, renderer.level + 1, false, true);
}), onEnd: lang.hitch(this, function(){
}),
onEnd: lang.hitch(this, function () {
this.removeChild(renderer);
})
}).play();
},

drillDown: function(renderer){
drillDown: function (renderer) {
// summary:
// Drill up from the given renderer.
// renderer: DomNode
Expand All @@ -95,26 +102,34 @@ define(["dojo/_base/lang", "dojo/_base/event", "dcl/dcl", "dojo/on", "dojo/dom-g
parentNode.removeChild(renderer);
domConstruct.place(renderer, this);
domStyle.set(renderer, {
left: (spanInfo.x - box.l)+ "px", top: (spanInfo.y - box.t)+ "px"
left: (spanInfo.x - box.l) + "px",
top: (spanInfo.y - box.t) + "px"
});
var zIndex = domStyle.get(renderer, "zIndex");
domStyle.set(renderer, "zIndex", 40);

fx.animateProperty({
node: renderer, duration: 500, properties: {
node: renderer,
duration: 500,
properties: {
left: {
end: box.l
}, top: {
},
top: {
end: box.t
}, height: {
},
height: {
end: box.h
}, width: {
},
width: {
end: box.w
}
}, onAnimate: lang.hitch(this, function(values){
},
onAnimate: lang.hitch(this, function () {
var box2 = domGeom.getContentBox(renderer);
this._layoutGroupContent(renderer, box2.w, box2.h, renderer.level + 1, false);
}), onEnd: lang.hitch(this, function(){
}),
onEnd: lang.hitch(this, function () {
domStyle.set(renderer, "zIndex", zIndex);
this.rootItem = item;
})
Expand Down
39 changes: 20 additions & 19 deletions GroupLabel.js
@@ -1,15 +1,14 @@
define(["dcl/dcl", "dojo/dom-construct", "dojo/dom-style"],
function(dcl, domConstruct, domStyle) {
define(["dcl/dcl", "dojo/dom-construct", "dojo/dom-style"], function (dcl, domConstruct, domStyle) {

return dcl(null, {
// summary:
// Specializes TreeMap to remove leaf labels and display group labels centered on group
// content instead of display them in headers.

createRenderer: dcl.superCall(function(sup){
return function(item, level, kind){
createRenderer: dcl.superCall(function (sup) {
return function (item, level, kind) {
var renderer = sup.call(this, item, level, kind);
if(kind == "content" || kind == "leaf"){
if (kind === "content" || kind === "leaf") {
var p = domConstruct.create("div");
domStyle.set(p, {
"zIndex": 30,
Expand All @@ -22,22 +21,24 @@ define(["dcl/dcl", "dojo/dom-construct", "dojo/dom-style"],
domConstruct.place(p, renderer);
}
return renderer;
}
};
}),

styleRenderer: function(renderer, item, level, kind){
switch(kind){
case "leaf":
domStyle.set(renderer, "background", this.getColorForItem(item).toHex());
case "content":
if(level == 0){
renderer.firstChild.innerHTML = this.getLabelForItem(item);
}else{
renderer.firstChild.innerHTML = null;
}
break;
case "header":
domStyle.set(renderer, "display", "none");
styleRenderer: function (renderer, item, level, kind) {
switch (kind) {
case "leaf":
/* jshint -W086 */
domStyle.set(renderer, "background", this.getColorForItem(item).toHex());
case "content":
/* jshint +W086 */
if (level === 0) {
renderer.firstChild.innerHTML = this.getLabelForItem(item);
} else {
renderer.firstChild.innerHTML = null;
}
break;
case "header":
domStyle.set(renderer, "display", "none");
}
}
});
Expand Down

0 comments on commit 7ec2647

Please sign in to comment.