Changeset 14429 for dojox/trunk/sketch

Timestamp:

07/14/08 09:26:50 (4 months ago)

Author:

ttrenka

Message:

Fix up the code style to be more readable. Fixes #6499. !strict.

Location:

dojox/trunk/sketch

Files:

• Anchor.js (modified) (3 diffs)
• Annotation.js (modified) (11 diffs)
• DoubleArrowAnnotation.js (modified) (7 diffs)
• Figure.js (modified) (19 diffs)
• LeadAnnotation.js (modified) (4 diffs)
• PreexistingAnnotation.js (modified) (3 diffs)
• SingleArrowAnnotation.js (modified) (9 diffs)
• tests/annotation.svg (modified) (1 diff)
• tests/test_full.html (modified) (1 diff)
• UnderlineAnnotation.js (modified) (3 diffs)
• UndoStack.js (modified) (1 diff)

dojox/trunk/sketch/Anchor.js

@@ -24 +24 @@
                 };
                 this.doChange=function(pt){
-                        if(this.isControl) this.shape.applyTransform(pt);
-                        else{
+                        if(this.isControl){
+                                this.shape.applyTransform(pt);
+                        } else{
                                 an.transform.dx+=pt.dx;
                                 an.transform.dy+=pt.dy;
@@ -38 +39 @@
 
                 this.enable=function(){
-                        if(!an.shape) return;
+                        if(!an.shape){ return; }
                         an.figure._add(this);
                         rect={ x:an[id].x-size, y:an[id].y-size, width:size*2, height:size*2 };
@@ -49 +50 @@
                 this.disable=function(){
                         an.figure._remove(this);
-                        if(an.shape) an.shape.remove(this.shape);
+                        if(an.shape){ an.shape.remove(this.shape); }
                         this.shape=null;
                         rect=null;

dojox/trunk/sketch/Annotation.js

@@ -11 +11 @@
 //              },
                 onMouseMove: function(e,rect){
-                                if(this._cshape){ 
-                                        this._cshape.setShape(rect);
-                                } else {
-                                        this._cshape=this.figure.surface.createRect(rect)
-                                                .setStroke({color:"#999", width:1, style:"ShortDot"})
-                                                .setFill([255,255,255,0.7]);
-                                        this._cshape.getEventSource().setAttribute("shape-rendering","crispEdges");
-                                }
+                        if(this._cshape){ 
+                                this._cshape.setShape(rect);
+                        } else {
+                                this._cshape=this.figure.surface.createRect(rect)
+                                        .setStroke({color:"#999", width:1, style:"ShortDot"})
+                                        .setFill([255,255,255,0.7]);
+                                this._cshape.getEventSource().setAttribute("shape-rendering","crispEdges");
+                        }
                 },
                 onMouseUp: function(e){
@@ -36 +36 @@
                                 }
                         }
-                        if(this._cshape) f.surface.remove(this._cshape);
+                        if(this._cshape){ 
+                                f.surface.remove(this._cshape); 
+                        }
                 },
                 _create: function(start,end){
@@ -44 +46 @@
                         var _=f.nextKey();
                         var a=new (this.annotation)(f, "annotation-"+_);
-                        a.transform={dx:start.x/f.zoomFactor, dy:start.y/f.zoomFactor};
-                        a.end={ x:end.x/f.zoomFactor, y:end.y/f.zoomFactor };
+                        a.transform={
+                                dx:start.x/f.zoomFactor, 
+                                dy:start.y/f.zoomFactor
+                        };
+                        a.end={ 
+                                x:end.x/f.zoomFactor, 
+                                y:end.y/f.zoomFactor 
+                        };
                         if(a.control){
-                                a.control={ x:Math.round((end.x/2)/f.zoomFactor),y:Math.round((end.y/2)/f.zoomFactor) };
+                                a.control={ 
+                                        x:Math.round((end.x/2)/f.zoomFactor),
+                                        y:Math.round((end.y/2)/f.zoomFactor) 
+                                };
                         }
                         f.onBeforeCreateShape(a);
@@ -56 +67 @@
                 }
         });
+
         ta.Annotation=function(figure, id){
                 //      for editing stuff.
@@ -71 +83 @@
                 };
 
-                if(this.figure) this.figure.add(this);
-        };
+                if(this.figure){ 
+                        this.figure.add(this); 
+                }
+        };
+
         var p=ta.Annotation.prototype;
         p.constructor=ta.Annotation;
         p.type=function(){ return ''; };
         p.getType=function(){ return ta.Annotation; };
-
         p.remove=function(){
                 this.figure.history.add(ta.CommandTypes.Delete, this, this.serialize());
@@ -99 +113 @@
                 this.figure.history.add(ta.CommandTypes.Create,this);
         }
-        p.onDblClick=function(event){
+        p.onDblClick=function(e){
                 var l=prompt('Set new text:',this.property('label'));
                 if(l!==false){
@@ -133 +147 @@
         p.calculate={
                 slope:function(p1, p2){
-                        if(!(p1.x-p2.x)) return 0;
+                        if(!(p1.x-p2.x)){ return 0; }
                         return ((p1.y-p2.y)/(p1.x-p2.x));
                 },
                 dx:function(p1, p2, dy){
                         var s=this.slope(p1,p2);
-                        if(s==0) return s;
+                        if(s==0){ return s; }
                         return dy/s; 
                 },
-                dy:function(p1, p2, dx){ return this.slope(p1,p2)*dx; }
+                dy:function(p1, p2, dx){ 
+                        return this.slope(p1,p2)*dx; 
+                }
         };
         p.drawBBox=function(){
@@ -153 +169 @@
                         this.boundingBox.getEventSource().setAttribute("shape-rendering","crispEdges");
                         this.figure._add(this);
-                } else this.boundingBox.setShape(r);
+                } else { 
+                        this.boundingBox.setShape(r); 
+                }
         };
         p.setBinding=function(pt){
@@ -165 +183 @@
         };
         p.setMode=function(m){
-                if(this.mode==m) return;
+                if(this.mode==m){ return; }
                 this.mode=m;
                 var method="disable";
-                if(m==ta.Annotation.Modes.Edit) method="enable";
+                if(m==ta.Annotation.Modes.Edit){ method="enable"; }
                 if(method=="enable"){
                         //      draw the bounding box
@@ -175 +193 @@
                 } else {
                         if(this.boundingBox){
-                                if(this.shape) this.shape.remove(this.boundingBox);
+                                if(this.shape){ this.shape.remove(this.boundingBox); }
                                 this.boundingBox=null;
                         }
                 }
-                for(var p in this.anchors){ this.anchors[p][method](); }
+                for(var p in this.anchors){ 
+                        this.anchors[p][method](); 
+                }
         };
 //      p.writeProperties=function(){
@@ -215 +235 @@
         ta.Annotation.register=function(name){
                 var cls=ta[name+'Annotation'];
-                ta.registerTool(name, function(p){dojo.mixin(p,{shape: name,annotation:cls});return new ta.AnnotationTool(p)});
+                ta.registerTool(name, function(p){
+                        dojo.mixin(p, {
+                                shape: name,
+                                annotation:cls
+                        });
+                        return new ta.AnnotationTool(p);
+                });
         };
 })();

dojox/trunk/sketch/DoubleArrowAnnotation.js

@@ -42 +42 @@
                 var opp=this.start.y-this.control.y;
                 var adj=this.start.x-this.control.x;
-                if(!adj) adj=1;
+                if(!adj){ adj=1; }
                 this.startRotation=Math.atan(opp/adj);
+
                 opp=this.control.y-this.end.y;
                 adj=this.control.x-this.end.x;
-                if(!adj) adj=1;
+                if(!adj){ adj=1; }
                 this.endRotation=Math.atan(opp/adj);
         };
@@ -54 +55 @@
 
                 //      figure out the pull of the curve and place accordingly
-                if(this.control.y<this.end.y) offset*=-1;
-                else offset+=this.textYOffset;
-                var ab={x:((this.control.x-this.start.x)*.5)+this.start.x, y:((this.control.y-this.start.y)*.5)+this.start.y};
-                var bc={x:((this.end.x-this.control.x)*.5)+this.control.x, y:((this.end.y-this.control.y)*.5)+this.control.y};
-                this.textPosition={x:((bc.x-ab.x)*.5)+ab.x, y:(((bc.y-ab.y)*.5)+ab.y)+offset};
+                if(this.control.y<this.end.y){ offset*=-1; }
+                else { offset+=this.textYOffset; }
+                var ab={
+                        x:((this.control.x-this.start.x)*.5)+this.start.x, 
+                        y:((this.control.y-this.start.y)*.5)+this.start.y
+                };
+                var bc={
+                        x:((this.end.x-this.control.x)*.5)+this.control.x, 
+                        y:((this.end.y-this.control.y)*.5)+this.control.y
+                };
+                this.textPosition={
+                        x:((bc.x-ab.x)*.5)+ab.x, 
+                        y:(((bc.y-ab.y)*.5)+ab.y)+offset
+                };
         };
         
         p.apply=function(obj){
-                if(!obj) return;
-                if(obj.documentElement) obj=obj.documentElement;
+                if(!obj){ return; }
+                if(obj.documentElement){ obj=obj.documentElement; }
                 this.readCommonAttrs(obj);
                 
                 for(var i=0; i<obj.childNodes.length; i++){
                         var c=obj.childNodes[i];
-                        if(c.localName=="text") this.property('label',c.childNodes.length?c.childNodes[0].nodeValue:'');
+                        if(c.localName=="text"){ this.property('label',c.childNodes.length?c.childNodes[0].nodeValue:''); }
                         else if(c.localName=="path"){
                                 //      the line
@@ -95 +105 @@
                 //      rotation matrix
                 var rot=this.startRotation;
-                if(this.control.x<this.start.x) rot+=Math.PI;
+                if(this.control.x<this.start.x){ rot+=Math.PI; }
                 var startRot=dojox.gfx.matrix.rotate(rot);
 
                 rot=this.endRotation;
-                if(this.control.x>=this.end.x) rot+=Math.PI;
+                if(this.control.x>=this.end.x){ rot+=Math.PI; }
                 var endRot=dojox.gfx.matrix.rotateAt(rot, this.end.x, this.end.y);
 
@@ -105 +115 @@
                 this.shape=this.figure.group.createGroup();
                 this.shape.getEventSource().setAttribute("id", this.id);
-                if(this.transform.dx||this.transform.dy) this.shape.setTransform(this.transform);
-                this.pathShape=this.shape.createPath(
-                                "M"+this.start.x+" "+this.start.y+"Q"+this.control.x+" "+this.control.y+" "+this.end.x+" "+this.end.y + " l0,0"
-                        ).setStroke(this.property('stroke'));
+                if(this.transform.dx||this.transform.dy){ this.shape.setTransform(this.transform); }
+
+                this.pathShape=this.shape.createPath("M"+this.start.x+" "+this.start.y+"Q"+this.control.x+" "+this.control.y+" "+this.end.x+" "+this.end.y + " l0,0")
+                        .setStroke(this.property('stroke'));
                 
                 this.startArrowGroup=this.shape.createGroup().setTransform({ dx:this.start.x, dy:this.start.y });
                 this.startArrowGroup.applyTransform(startRot);
 //              console.log('startArrow',this.property('fill'));
-                this.startArrow=this.startArrowGroup.createPath("M0,0 l20,-5 -3,5 3,5 Z").setFill(this.property('fill'));
+                this.startArrow=this.startArrowGroup.createPath("M0,0 l20,-5 -3,5 3,5 Z")
+                        .setFill(this.property('fill'));
                 
                 this.endArrowGroup=this.shape.createGroup().setTransform(endRot);
-                this.endArrow=this.endArrowGroup.createPath(
-                        "M" + this.end.x + "," + this.end.y + " l-20,-5 3,5 -3,5 Z"
-                ).setFill(this.property('fill'));
+                this.endArrow=this.endArrowGroup.createPath("M" + this.end.x + "," + this.end.y + " l-20,-5 3,5 -3,5 Z")
+                        .setFill(this.property('fill'));
+
                 this.labelShape=this.shape.createText({
-                        x:this.textPosition.x, y:this.textPosition.y, text:this.property('label'), align:this.textAlign
-                }).setFont(font).setFill(this.property('fill'));
+                                x:this.textPosition.x, 
+                                y:this.textPosition.y, 
+                                text:this.property('label'), 
+                                align:this.textAlign
+                        })
+                        .setFont(font)
+                        .setFill(this.property('fill'));
         };
         p.destroy=function(){
-                if(!this.shape) return;
+                if(!this.shape){ return; }
                 this.startArrowGroup.remove(this.startArrow);
                 this.endArrowGroup.remove(this.endArrow);
@@ -138 +154 @@
                 this._rot();
                 this._pos();
+
                 //      rotation matrix
                 var rot=this.startRotation;
-                if(this.control.x<this.start.x) rot+=Math.PI;
+                if(this.control.x<this.start.x){ rot+=Math.PI; }
                 var startRot=dojox.gfx.matrix.rotate(rot);
                 rot=this.endRotation;
-                if(this.control.x>=this.end.x) rot+=Math.PI;
+                if(this.control.x>=this.end.x){ rot+=Math.PI; }
                 var endRot=dojox.gfx.matrix.rotateAt(rot, this.end.x, this.end.y);
 
                 this.shape.setTransform(this.transform);
-                this.pathShape.setShape(
-                                "M"+this.start.x+" "+this.start.y+" Q"+this.control.x+" "+this.control.y+" "+this.end.x+" "+this.end.y + " l0,0"
-                        ).setStroke(this.property('stroke'));
+                this.pathShape.setShape("M"+this.start.x+" "+this.start.y+" Q"+this.control.x+" "+this.control.y+" "+this.end.x+" "+this.end.y + " l0,0")
+                        .setStroke(this.property('stroke'));
                 this.startArrowGroup.setTransform({ dx:this.start.x, dy:this.start.y });
                 this.startArrowGroup.applyTransform(startRot);
@@ -155 +171 @@
                 
                 this.endArrowGroup.setTransform(endRot);
-                this.endArrow.setShape(
-                        "M" + this.end.x + "," + this.end.y + " l-20,-5 3,5 -3,5 Z"
-                ).setFill(this.property('fill'));
-                this.labelShape.setShape({x:this.textPosition.x, y:this.textPosition.y, text:this.property('label')}).setFill(this.property('fill'));
-        };
+                this.endArrow.setShape("M" + this.end.x + "," + this.end.y + " l-20,-5 3,5 -3,5 Z")
+                        .setFill(this.property('fill'));
+                this.labelShape.setShape({
+                                x:this.textPosition.x, 
+                                y:this.textPosition.y, 
+                                text:this.property('label')
+                        })
+                        .setFill(this.property('fill'));
+        };
+
         p.getBBox=function(){
                 var x=Math.min(this.start.x, this.control.x, this.end.x);
@@ -167 +188 @@
                 return { x:x, y:y, width:w, height:h };
         };
+
         p.serialize=function(){
                 var s=this.property('stroke');

dojox/trunk/sketch/Figure.js

@@ -35 +35 @@
                 this.isSelected=function(obj){
                         for(var i=0; i<self.selected.length; i++){
-                                if(self.selected[i]==obj) return true;
+                                if(self.selected[i]==obj){ return true; }
                         }
                         return false;
@@ -65 +65 @@
                 };
                 this.clearSelections=function(){
-                        for(var i=0; i<self.selected.length; i++) 
+                        for(var i=0; i<self.selected.length; i++){ 
                                 self.selected[i].setMode(ta.Annotation.Modes.View);
+                        }
                         self.selected=[]; 
                 };
@@ -77 +78 @@
                         for(var i=0; i<self.selected.length; i++){
                                 if(self.selected[i]==o){
-                                        idx=i; break;
+                                        idx=i; 
+                                        break;
                                 }
                         }
@@ -111 +113 @@
                         } else if(!o.setMode){
                                 //      skip me.
-                        } else self.select(o);
-                };
+                        } else { 
+                                self.select(o); 
+                        }
+                };
+
                 this._dblclick=function(e){
                         var o=self._fromEvt(e);
@@ -123 +128 @@
                         var prevent=false;
                         if(e.ctrlKey){
-                                        if(e.keyCode==90){ //ctrl+z
-                                                self.undo();
-                                                prevent = true;
-                                        }else if(e.keyCode==89){ //ctrl+y
-                                                self.redo();
-                                                prevent = true;
-                                        }
+                                if(e.keyCode==90){ //ctrl+z
+                                        self.undo();
+                                        prevent = true;
+                                }
+                                else if(e.keyCode==89){ //ctrl+y
+                                        self.redo();
+                                        prevent = true;
+                                }
                         }
 
@@ -147 +153 @@
                         self._startPoint={ x:e.pageX, y:e.pageY };
                         var win = dijit.getDocumentWindow(self.node.ownerDocument);
+
                         //      figure out the coordinates within the iframe
                         self._ctr=dojo._abs(self.node);
@@ -170 +177 @@
                 };
                 this._mm=function(e){
-                        if(!self._ctr) return;
+                        if(!self._ctr){ return; }
                         var x=e.clientX-self._ctr.x;
                         var y=e.clientY-self._ctr.y;
@@ -180 +187 @@
                                 self._c.setBinding({dx:Math.round(dx/self.zoomFactor), dy:Math.round(dy/self.zoomFactor)});
                                 self._lp={x:x, y:y};
-                        }
-                        else {
+                        } else {
                                 self._end={x:dx, y:dy};
                                 var rect={
@@ -222 +228 @@
         var p=ta.Figure.prototype;
         p.initUndoStack=function(){
-                        this.history=new ta.UndoStack(this);
+                this.history=new ta.UndoStack(this);
         };
         p.setTool=function(/*dojox.sketch._Plugin*/t){
@@ -255 +261 @@
                 this._cons.push(dojo.connect(this.surface.getEventSource().ownerDocument, 'onkeydown', this._keydown));
                 
-                //      rect hack.  Fcuking VML>
+                //      rect hack.  Fcuking VML.
                 this.group.createRect({ x:0, y:0, width:this.size.w, height:this.size.h });
                 this.image=this.group.createImage({ width:this.size.w, height:this.size.h, src:this.imageSrc });
         };
+
         p.destroy=function(isLoading){
-                if(!this.node){
-                        return;
-                }
+                if(!this.node){ return; }
                 if(!isLoading){
-                        if(this.history) this.history.destroy();
+                        if(this.history){ this.history.destroy(); }
                         if(this._subscribed){
                                 dojo.unsubscribe(this._subscribed);
@@ -270 +275 @@
                         }
                 }
-                dojo.forEach(this._cons,dojo.disconnect);
+                dojo.forEach(this._cons, dojo.disconnect);
                 this._cons=[];
 
@@ -278 +283 @@
                 this.shapes=[];
         };
+
         p.draw=function(){ };
         p.zoom=function(pct){
@@ -316 +322 @@
         };
         p._get=function(key){
-                if(key&&key.indexOf("bounding")>-1) key=key.replace("-boundingBox","");
+                if(key&&key.indexOf("bounding")>-1){ 
+                        key=key.replace("-boundingBox","");
+                }
                 return this.obj[key];
         };
@@ -348 +356 @@
                         }
                 }
-                if(idx>-1) this.shapes.splice(idx, 1);
+                if(idx>-1){ this.shapes.splice(idx, 1); }
                 return annotation;
         };
@@ -363 +371 @@
                 //      convert an existing annotation to a different kind of annotation
                 var ctor=t+"Annotation";
-                if(!ta[ctor]) return;
-                var type=ann.type(), id=ann.id, label=ann.label, mode=ann.mode,
-                        tokenId=ann.tokenId;
+                if(!ta[ctor]){ return; }
+                var type=ann.type(), id=ann.id, label=ann.label, mode=ann.mode, tokenId=ann.tokenId;
                 var start, end, control, transform;
                 switch(type){
@@ -401 +408 @@
                         n.transform={dx:transform.dx+start.x, dy:transform.dy+start.y };
                 } else {
-                        if(n.transform) n.transform=transform;
-                        if(n.start) n.start=start;
-                }
-                if(n.end) n.end=end;
-                if(n.control) n.control=control;