Changeset 62

Show
Ignore:
Timestamp:
07/20/08 22:51:51 (2 months ago)
Author:
bi..@lilyapp.org
Message:

fix item 1 from bug #28

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lily/lily/chrome/content/externals/patcher.js

    r57 r62  
    250250                if(!Lily.patcherReloadFlag) { //only when we're not reloading the object. 
    251251                        if(isPatchString) { thisPatch.file.remove(false); } //remove the temp file if we have one. 
    252                         thisPatch.obj.close(); //clean up the patch 
     252                        if(thisPatch.obj) thisPatch.obj.close(); //clean up the patch 
    253253                        thisPatch = {obj:null,id:pid,file:null,json:null}; //reset the thispatch object  
    254254                }        

  • trunk/lily/lily/chrome/content/object.js

    r61 r62  
    10661066                 
    10671067                //methods for editing default object 
    1068                 if(!this.objView.usesCustomUI&&thisPtr.objView.parent.displayArgs) { //not if there's a custom or if we're hiding the args (ie patcher) 
     1068                if(!this.objView.usesCustomUI/*&&thisPtr.objView.parent.displayArgs*/) { //not if there's a custom or if we're hiding the args (ie patcher) 
    10691069                        this.attachObserver(this.id,"dblclick",function(){thisPtr.startEditObj();},"edit"); 
    10701070                        this.attachObserver(this.id,"blur",function(){thisPtr.doneEditObj();},"edit"); 
    …… 
    16991699                if(this.objInput) { 
    17001700                        var args = (typeof obj.displayArgs == "string") ? obj.displayArgs : obj.args; 
    1701                         this.objInput.value=this.display + ((args)?" ":"") + args; 
     1701                        this.objInput.value=this.display + ((args)?" ":"") + (obj.displayArgs==true?args:""); 
    17021702                        this.objInput.focus(); 
    17031703                        this.objInput.select();