Changeset 77

Timestamp:

07/26/08 08:43:23 (4 months ago)

Author:

bi..@lilyapp.org

Message:

fix bug #19

Files:

• trunk/lily/lily/chrome/content/object.js (modified) (5 diffs)
• trunk/lily/lily/chrome/content/patch.js (modified) (5 diffs)

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

@@ -62 +62 @@
-        this.loadsSubPatchByName = false; //true when a subpatch is invoked by name
-        this.hasBeenResized=false; //true when an extern has resized by hand.
+        this.isPaste=false; //true if we're creating this as a paste
-        
-        this.ui=null; //to filled in when view instantiates
@@ -868 +869 @@
-                //      log("deselect- no e "+thisPtr.id)
-                                
-
+ || (e && e.type=="paste")
-                        return; 
-                        
@@ -1010 +1011 @@
-        //handler for edit state switch
-        this.toggleEditState=function() {
-
-
+if(!thisPtr.objView.parent.isPaste)
+ 
-        }
-        
@@ -1753 +1754 @@
-                
-                if(!this.parent.subPatcherID) //no listeners for subpatch objects
- //setTimeout(function(){thisPtr.controller.addDefaultListeners();},100);
+
-                
-                this.contentWrapper=this.getElByID(this.parent.createElID("contentWrapper"));
@@ -1761 +1762 @@
-                this.parent.displayElement=this.contentContainer;
-                this.parent.resizeElement=this.contentWrapper;  
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                        thisPtr.controller.toggleEditState();
+                        thisPtr.parent.isPaste=false;
+                }       
-                
-                setTimeout(function(){thisPtr.updateObjSize();},100);

trunk/lily/lily/chrome/content/patch.js

@@ -643 +643 @@
-                        LilyDebugWindow.error("error- patch not found.");
-        }
+        
+        /*
+                Method: openHidden
+                        open an existing patch as hidden.
+        
+                Arguments: 
+                        path    - path to patch (required)
+                        
+                Returns: 
+                        returns the newly created patch object.         
+        */
+        //open an existing patch window.
+        this.openHidden=function(path) {
+                
+                var fPath=LilyUtils.getFilePath(path);
+                var file=(fPath)?LilyUtils.getFileHandle(fPath):null;
+                
+                if(file)
+                        return Lily.openPatchFromFile(file,true,true);
+                else
+                        LilyDebugWindow.error("error- patch not found.");
+        }       
+        
+        /*
+                Method: openReadOnly
+                        open an existing patch as readonly.
+        
+                Arguments: 
+                        path    - path to patch (required)
+                        
+                Returns: 
+                        returns the newly created patch object.         
+        */
+        //open an existing patch window.
+        this.openReadOnly=function(path) {
+                
+                var fPath=LilyUtils.getFilePath(path);
+                var file=(fPath)?LilyUtils.getFileHandle(fPath):null;
+                
+                if(file)
+                        return Lily.openPatchFromFile(file,true,false);
+                else
+                        LilyDebugWindow.error("error- patch not found.");
+        }       
-
-        /*
@@ -795 +839 @@
-                                        //create the object
-                                        var o=this.createObject(oArray[x].name,subPatchID,oArray[x].top,oArray[x].left,this.updateObjID(oArray[x].objID,opID),oArray[x].args,oArray[x].hasBeenResized);
+
+                                        if(opID) {
+                                                o.isPaste=true; //set the flag so this doesn't get deselected.
+                                        }
-
-                                        //set some object properties
@@ -843 +891 @@
-                                                parent_patch.patchModel.addSubPatch(x,false,null); //add this subpatch to the list
-                                        }
+                                        
+                                        if(opID) {
+                                                o.controller.select({type:"paste"}); //if we're pasting, select the object after we create it.
+                                        }
-                                }
-                        }
@@ -849 +901 @@
-                                if(oArray[a].type=="connection") {
-                                        var c=this.createConnection(this.updateObjID(oArray[a].inlet,opID),this.updateObjID(oArray[a].outlet,opID),oArray[a].segmentArray,subPatchID);
-
+
+
-                                                c.controller.setHiddenInPerf(oArray[a].hiddenInPerf);
+                                        }
+                                        
+                                        if(opID) {
+                                                c.controller.select({type:"paste"});
+                                        }                                               
+                                        
-                                }
-                        }
@@ -1410 +1469 @@
-        this.deselectAll=function(e) {
-                
-
+
+
+
+
+
+
+
+
+
+
+
-                        return;
-