Changeset 81

Timestamp:

08/12/08 06:29:55 (4 months ago)

Author:

bi..@lilyapp.org

Message:

adding a help for slider and fixing a couple of bugs in slider

Files:

• trunk/lily/lily/chrome/content/externals/slider.js (modified) (8 diffs)
• trunk/lily/lily/chrome/content/help-patches/slider-help.json (added)

trunk/lily/lily/chrome/content/externals/slider.js

@@ -33 +33 @@
-{
-        
-        /*
-        
-        //args passed to the constructor to init the slider
-        //also editable using the inspector
-        var argsArr=LilyUtils.splitArgs(args);
-        this.args=args;
-                
-        //init from args
-        this.rangeStart=(argsArr.length>=2&&typeof argsArr[0]!="undefined")?parseInt(argsArr[0]):1; //slider range
-        this.rangeEnd=(argsArr.length>=2&&typeof argsArr[1]!="undefined")?parseInt(argsArr[1]):20; //slider range
-        this.orientation=(argsArr.length==3&&typeof argsArr[2]!="undefined")?argsArr[2]:"horizontal"; //slider orientation
-        
-        this.inlet1 = new this.inletClass("inlet1",this,"\"set\" sets & positions slider");     
-        this.outlet1 = new this.outletClass("outlet1",this,"float value on slide");
-        this.outlet2 = new this.outletClass("outlet2",this,"float value after slide");
-
-        //create a config with the params we want to be user editable in the inspector
-        //must follow the form- property name, property value, label (for inspector), data type (number,boolean,string)
-        this.setInspectorConfig([
-                {name:"rangeStart",value:thisPtr.rangeStart,label:"Range Start",type:"number",input:"text"},
-                {name:"rangeEnd",value:thisPtr.rangeEnd,label:"Range End",type:"number",input:"text"},
-                {name:"orientation",value:thisPtr.orientation,label:"Orientation",type:"string",options:[{label:"Vertical",value:"vertical"},{label:"Horizontal",value:"horizontal"}],input:"radio"}
-        ]);
-        
-        //save the values returned by the inspector- returned in form {valueName:value...}
-        //called after the inspector window is saved
-        this.saveInspectorValues=function(vals) {
-                
-                //update the local properties
-                for(var x in vals)
-                        if(x=="orientation")
-                                thisPtr[x]=vals[x];
-                        else
-                                thisPtr[x]=parseInt(vals[x]);
-                        
-                //update the arg str
-                this.args=""+vals["rangeStart"]+" "+vals["rangeEnd"]+" "+vals["orientation"];   
-                        
-                //reload the frame & start over with the new values
-                slider=null;
-                iframe.reload();
-                thisPtr.controller.cleanupOutletConnections();
-        }
-        
-        this.inlet1["set"]=function(num) {
-                slider.setValue(parseInt(num));
-        }
-        
-        
-        */
-        
-        var thisPtr=this;
-        
@@ -90 +39 @@
-        var argsArr=LilyUtils.splitArgs(args);
-        this.args=args; 
+        
+        var on_change_value = 0;
-                        
-        var bgcolor=argsArr[0]||this.color;
@@ -119 +70 @@
-        this.args=args; 
-        this.allowFont=false; //dont allow font changes
-        
-        var timeout = 0; //for set timeout ids
-        
-        this.inlet1 = new this.inletClass("inlet1",this,"\"set\" sets & positions slider");             
@@ -195 +144 @@
-        
-        function handleMouseMove(e) {
-
-
-
+
-                if(thisPtr.orientation == "vertical") {
-                        var val = (parseInt(e.clientY)-parseInt(thisPtr.top))-parseInt(handleOffset);
@@ -220 +167 @@
-                }
-                
-
-
-
+
+
-        }
-        
@@ -228 +174 @@
-                thisPtr.controller.patchController.removePatchObserver(thisPtr.createElID("slider"),"mouseup",handleMouseUpFunc,"performance");         
-                thisPtr.controller.patchController.removePatchObserver(thisPtr.createElID("slider"),"mousemove",handleMouseMove,"performance");                 
+                doOutputOnComplete(on_change_value);
-        }
-        
@@ -244 +191 @@
-                        if(tmp<=0) {
-                                handle.style.top = (0)+"px";
-1
+2
-                        } else if(tmp+handleOffset>=maxY) {
-                                handle.style.top = (maxY-handleOffset)+"px";
-1
+2
-                        } else {
-                                handle.style.top = (tmp)+"px";
-1
+2
-                        }                       
-                } else {
@@ -256 +203 @@
-                        if(tmp<=0) {
-                                handle.style.left = (0-horizOffset)+"px";
-1
+2
-                        } else if(tmp+handleOffset>=maxX) {
-                                handle.style.left = (maxX-handleOffset-horizOffset)+"px";
-1
+2
-                        } else {
-                                handle.style.left = (tmp-horizOffset)+"px";
-1
+2
-                        }
-                }