Changeset 83

Timestamp:

08/14/08 21:09:55 (4 months ago)

Author:

bi..@lilyapp.org

Message:

a few more fixes for slider

Files:

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

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

@@ -39 +39 @@
-        var argsArr=LilyUtils.splitArgs(args);
-        this.args=args; 
-
-
-
-
+
+
+
-        var roundness=argsArr[1]||0;
-        var bwidth=argsArr[2]||0;
-        var bcolor=argsArr[3]||"#000000";
-        var bstyle=argsArr[4]||"solid";
-=
+>
-        this.rangeStart=(argsArr.length>=7&&typeof argsArr[6]!="undefined")?parseInt(argsArr[6]):1; //slider range
-        this.rangeEnd=(argsArr.length>=8&&typeof argsArr[7]!="undefined")?parseInt(argsArr[7]):20; //slider range
-        
-
-
-
-
-
-
+
-        this.cornerRoundness=roundness;
-        this.borderWidth=bwidth;
@@ -62 +56 @@
-        this.borderStyle=bstyle;
-        
+        //default size
+        var default_height = 50;
+        var default_width = 300;
+        
+        //default handle dimensions
+        var handle = null; //dom node will go here...
+        var handleHeight = "80%";
+        var handleWidth = "10%";                        
+                        
-        //used for determining the slider boundries.
-        var minX = 0;
@@ -67 +70 @@
-        var minY = 0;
-        var maxY = 0;
-       
-this.args=args;        
-this.allowFont=false; //dont allow font changes
+
+//initialize onchange
+var on_change_value = 0;       
-        
-        this.inlet1 = new this.inletClass("inlet1",this,"\"set\" sets & positions slider");             
@@ -76 +79 @@
-        
-        this.setInspectorConfig([
+                {name:"handleColor",value:thisPtr.handleColor,label:"Handle Color",type:"text",input:"text"},
-                {name:"cornerRoundness",value:thisPtr.cornerRoundness,label:"% Corner Roundness",type:"number",input:"text"},
-                {name:"borderWidth",value:thisPtr. borderWidth,label:"Border Width",type:"number",input:"text"},
@@ -104 +108 @@
-                        
-                //update the arg str
-
-
-
-
-
-
+
+
+
+
+
+
+
-                
-                thisPtr.init();
@@ -116 +121 @@
-                
-        //custom html
--moz-border-radius:"+roundness+"%;border:"+bwidth+"px "+bcolor+" "+bstyle+";width:100px;height:100px;background:" + bgcolor + "
-position:relative;height:"+handleHeight+";width:"+handleWidth+";background:red
+width:"+default_width+"px;height:"+default_height+"px
+-moz-border-radius:"+roundness+"%;border:"+bwidth+"px "+bcolor+" "+bstyle+";position:relative;height:"+handleHeight+";width:"+handleWidth+";background:"+bgcolor+"
-        "</div>";
-
+       
-        this.ui=new LilyObjectView(this,slider_html);
-        this.ui.draw();
@@ -127 +132 @@
-        
-        //set up some handle dimnensions 
-var 
+
-        var handleOffset = (this.orientation == "vertical")?Math.ceil(this.height*.10):Math.ceil(this.width*.10);
-        var horizOffset = (this.orientation == "vertical")?0:(parseInt(thisPtr.width/2)-parseInt(handleOffset/2));                      
@@ -147 +152 @@
-                if(thisPtr.orientation == "vertical") {
-                        var val = (parseInt(e.clientY)-parseInt(thisPtr.top))-parseInt(handleOffset);
--parseInt(handleOffset)
+
-                                handle.style.top = (0)+"px";    
-                        } else if(val+handleOffset>=maxY) {
-                                handle.style.top = (maxY-handleOffset)+"px";
-                        } else {
-(val-parseInt(handleOffset))
+val
-                        }
-                        doOutput(val);
@@ -225 +230 @@
-                thisPtr.outlet2.doOutlet(parseInt(tmp));
-        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        //init
-        this.init=function() {
-                
-                //handle dimensions
-
-
-
-
-
+
+
+
+
+
+
+
+
-                setBounds();
-
@@ -254 +290 @@
-        }
-        
+        this.inlet1["num"]=function(num) {
+                setValue(parseInt(num));
+        }       
+        
-        this.controller.setNoBorders(true);     
-        this.controller.attachObserver(this.createElID("slider"),"mousedown",handleMouseDownFunc,"performance");

trunk/lily/lily/chrome/content/help-patches/slider-help.json

@@ -1 @@
-570,'height':442
+623,'height':436
-        'print!uid=2338035945695':{'name':'print','top':334,'left':168,'color':'#FFFFFF','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':3,'height':19,'width':83,'visibility':'visible','hiddenInPerf':false,'groupName':'null','cssName':'','customColor':'false','hasBeenResized':'false','args':'on slide','objID':'print!uid=2338035945695','type':'object'},
-        'print!uid=1169017971725':{'name':'print','top':335,'left':358,'color':'#FFFFFF','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':5,'height':19,'width':100,'visibility':'visible','hiddenInPerf':false,'groupName':'null','cssName':'','customColor':'false','hasBeenResized':'false','args':'on change','objID':'print!uid=1169017971725','type':'object'},
@@ -9 +9 @@
-        'comment!uid=1183087637211':{'name':'comment','top':17,'left':245,'color':'transparent','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':13,'height':11,'width':262,'visibility':'visible','hiddenInPerf':false,'groupName':'','cssName':'','customColor':'false','hasBeenResized':'false','args':'Output or display numbers using a slider.','inspectorConfig':[{name:"commentText", value:"Output or display numbers using a slider.", label:"Comment Text", type:"string", input:"textarea"}],'objID':'comment!uid=1183087637211','type':'object'},
-        'launchurl!uid=1189812748397':{'name':'launchurl','top':5,'left':22,'color':'#FFFFFF','fontSize':'45','fontFamily':'Verdana','fontColor':'blue','opacity':1,'zIndex':13,'height':40,'width':113,'visibility':'visible','hiddenInPerf':false,'groupName':'','cssName':'','customColor':'false','hasBeenResized':'false','args':'http://wiki.lilyapp.org/Slider SLIDER','inspectorConfig':[{name:"linkURL", value:"http://wiki.lilyapp.org/Slider", label:"Link URL", type:"string", input:"textarea"}, {name:"linkText", value:"SLIDER", label:"Link Text", type:"string", input:"textarea"}],'objID':'launchurl!uid=1189812748397','type':'object'},
+        'slider!uid=1218546782893':{'name':'slider','top':91,'left':480,'color':'#cccccc','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':11,'height':215,'width':97,'visibility':'visible','hiddenInPerf':false,'groupName':'','cssName':'','customColor':'true','hasBeenResized':'false','args':'#FFFFFF 50 5 #000000 solid vertical 1 20','inspectorConfig':[{name:"handleColor", value:"#FFFFFF", label:"Handle Color", type:"text", input:"text"}, {name:"cornerRoundness", value:"50", label:"% Corner Roundness", type:"number", input:"text"}, {name:"borderWidth", value:"5", label:"Border Width", type:"number", input:"text"}, {name:"borderColor", value:"#000000", label:"Border Color", type:"text", input:"text"}, {name:"borderStyle", value:"solid", label:"Border Style", type:"string", options:[{label:"None", value:"none"}, {label:"Dashed", value:"dashed"}, {label:"Dotted", value:"dotted"}, {label:"Double", value:"double"}, {label:"Groove", value:"groove"}, {label:"Inset", value:"inset"}, {label:"Outset", value:"outset"}, {label:"Ridge", value:"ridge"}, {label:"Solid", value:"solid"}], input:"select"}, {name:"orientation", value:"vertical", label:"Orientation", type:"string", options:[{label:"Vertical", value:"vertical"}, {label:"Horizontal", value:"horizontal"}], input:"radio"}, {name:"rangeStart", value:1, label:"Range Start", type:"number", input:"text"}, {name:"rangeEnd", value:20, label:"Range End", type:"number", input:"text"}],'objID':'slider!uid=1218546782893','type':'object'},
+        'slider!uid=1218546996040':{'name':'slider','top':153,'left':168,'color':'#cccccc','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':11,'height':64,'width':286,'visibility':'visible','hiddenInPerf':false,'groupName':'','cssName':'','customColor':'true','hasBeenResized':'false','args':'#000000 0 0 #000000 solid undefined 1 20','inspectorConfig':[{name:"handleColor", value:"#000000", label:"Handle Color", type:"text", input:"text"}, {name:"cornerRoundness", value:"0", label:"% Corner Roundness", type:"number", input:"text"}, {name:"borderWidth", value:"0", label:"Border Width", type:"number", input:"text"}, {name:"borderColor", value:"#000000", label:"Border Color", type:"text", input:"text"}, {name:"borderStyle", value:"solid", label:"Border Style", type:"string", options:[{label:"None", value:"none"}, {label:"Dashed", value:"dashed"}, {label:"Dotted", value:"dotted"}, {label:"Double", value:"double"}, {label:"Groove", value:"groove"}, {label:"Inset", value:"inset"}, {label:"Outset", value:"outset"}, {label:"Ridge", value:"ridge"}, {label:"Solid", value:"solid"}], input:"select"}, {name:"orientation", value:"undefined", label:"Orientation", type:"string", options:[{label:"Vertical", value:"vertical"}, {label:"Horizontal", value:"horizontal"}], input:"radio"}, {name:"rangeStart", value:1, label:"Range Start", type:"number", input:"text"}, {name:"rangeEnd", value:20, label:"Range End", type:"number", input:"text"}],'objID':'slider!uid=1218546996040','type':'object'},
-        'number!uid=1169019440494.outlet1_prepend!uid=1169019400944.inlet1':{'inlet':'prepend!uid=1169019400944.inlet1','outlet':'number!uid=1169019440494.outlet1','type':'connection','hiddenInPerf':false,'segmentArray':[
-{'orientation':'vertical',startLeft:22,startTop:146,endLeft:22,endTop:158.5},
@@ -15 +17 @@
-]
-},
-        'slider!uid=1218546782893':{'name':'slider','top':91,'left':480,'color':'#6b6b6b','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':11,'height':218,'width':48,'visibility':'visible','hiddenInPerf':false,'groupName':'','cssName':'','customColor':'true','hasBeenResized':'false','args':'#6b6b6b 0 2 #000000 solid undefined 1 20','inspectorConfig':[{name:"cornerRoundness", value:0, label:"% Corner Roundness", type:"number", input:"text"}, {name:"borderWidth", value:2, label:"Border Width", type:"number", input:"text"}, {name:"borderColor", value:"#000000", label:"Border Color", type:"text", input:"text"}, {name:"borderStyle", value:"solid", label:"Border Style", type:"string", options:[{label:"None", value:"none"}, {label:"Dashed", value:"dashed"}, {label:"Dotted", value:"dotted"}, {label:"Double", value:"double"}, {label:"Groove", value:"groove"}, {label:"Inset", value:"inset"}, {label:"Outset", value:"outset"}, {label:"Ridge", value:"ridge"}, {label:"Solid", value:"solid"}], input:"select"}, {name:"orientation", value:"vertical", label:"Orientation", type:"string", options:[{label:"Vertical", value:"vertical"}, {label:"Horizontal", value:"horizontal"}], input:"radio"}, {name:"rangeStart", value:1, label:"Range Start", type:"number", input:"text"}, {name:"rangeEnd", value:20, label:"Range End", type:"number", input:"text"}],'objID':'slider!uid=1218546782893','type':'object'},
-        'prepend!uid=1169019400944.outlet1_slider!uid=1218546782893.inlet1':{'inlet':'slider!uid=1218546782893.inlet1','outlet':'prepend!uid=1169019400944.outlet1','type':'connection','hiddenInPerf':false,'segmentArray':[
-{'orientation':'vertical',startLeft:168,startTop:144,endLeft:168,endTop:84.5},
@@ -23 +24 @@
-},
-        'slider!uid=1218546782893.outlet2_print!uid=1169017971725.inlet1':{'inlet':'print!uid=1169017971725.inlet1','outlet':'slider!uid=1218546782893.outlet2','type':'connection','hiddenInPerf':false,'segmentArray':[
-24,startTop:320,endLeft:524
-24
+70,startTop:313,endLeft:570
+70
-{'orientation':'vertical',startLeft:358,startTop:330,endLeft:358,endTop:340}
-]
-},
-        'slider!uid=1218546782893.outlet1_print!uid=2338035945695.inlet1':{'inlet':'print!uid=2338035945695.inlet1','outlet':'slider!uid=1218546782893.outlet1','type':'connection','hiddenInPerf':false,'segmentArray':[
-20
+13
-{'orientation':'horizontal',startLeft:480,startTop:329.5,endLeft:168,endTop:329.5},
-{'orientation':'vertical',startLeft:168,startTop:329.5,endLeft:168,endTop:339}
-]
-},
-        'slider!uid=1218546996040':{'name':'slider','top':153,'left':168,'color':'#707070','fontSize':'12','fontFamily':'Verdana','fontColor':'#000000','opacity':1,'zIndex':11,'height':55,'width':292,'visibility':'visible','hiddenInPerf':false,'groupName':'','cssName':'','customColor':'true','hasBeenResized':'false','args':'#707070 0 2 #000000 solid undefined 1 20','inspectorConfig':[{name:"cornerRoundness", value:0, label:"% Corner Roundness", type:"number", input:"text"}, {name:"borderWidth", value:2, label:"Border Width", type:"number", input:"text"}, {name:"borderColor", value:"#000000", label:"Border Color", type:"text", input:"text"}, {name:"borderStyle", value:"solid", label:"Border Style", type:"string", options:[{label:"None", value:"none"}, {label:"Dashed", value:"dashed"}, {label:"Dotted", value:"dotted"}, {label:"Double", value:"double"}, {label:"Groove", value:"groove"}, {label:"Inset", value:"inset"}, {label:"Outset", value:"outset"}, {label:"Ridge", value:"ridge"}, {label:"Solid", value:"solid"}], input:"select"}, {name:"orientation", value:"horizontal", label:"Orientation", type:"string", options:[{label:"Vertical", value:"vertical"}, {label:"Horizontal", value:"horizontal"}], input:"radio"}, {name:"rangeStart", value:1, label:"Range Start", type:"number", input:"text"}, {name:"rangeEnd", value:20, label:"Range End", type:"number", input:"text"}],'objID':'slider!uid=1218546996040','type':'object'},
-        'prepend!uid=1169019400944.outlet1_slider!uid=1218546996040.inlet1':{'inlet':'slider!uid=1218546996040.inlet1','outlet':'prepend!uid=1169019400944.outlet1','type':'connection','hiddenInPerf':false,'segmentArray':[
-{'orientation':'vertical',startLeft:168,startTop:144,endLeft:168,endTop:154.5},
@@ -42 +42 @@
-},
-        'slider!uid=1218546996040.outlet2_print!uid=1169017971725.inlet1':{'inlet':'print!uid=1169017971725.inlet1','outlet':'slider!uid=1218546996040.outlet2','type':'connection','hiddenInPerf':false,'segmentArray':[
-56,startTop:219,endLeft:45
-5
+46,startTop:224,endLeft:44
+4
-{'orientation':'vertical',startLeft:358,startTop:329.5,endLeft:358,endTop:340}
-]
-},
-        'slider!uid=1218546996040.outlet1_print!uid=2338035945695.inlet1':{'inlet':'print!uid=2338035945695.inlet1','outlet':'slider!uid=1218546996040.outlet1','type':'connection','hiddenInPerf':false,'segmentArray':[
-19
+24
-{'orientation':'horizontal',startLeft:168,startTop:273.5,endLeft:168,endTop:273.5},
-{'orientation':'vertical',startLeft:168,startTop:273.5,endLeft:168,endTop:339}