Changeset 63

Timestamp:

07/20/08 23:13:30 (2 months ago)

Author:

bi..@lilyapp.org

Message:

Fix itmes 2 & 3 from bug #28

Files:

• trunk/lily/lily/chrome/content/externals.js (modified) (5 diffs)
• trunk/lily/lily/chrome/content/utils.js (modified) (2 diffs)

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

@@ -69 +69 @@
-        */
-        add:function(leafName,filePath) {
-
-
+
+
+
+
+
+
+
+
+
+
-                }       
-        },
@@ -127 +135 @@
-                
-                for(var i=0;i<this.objArray.length;i++) { //don't load patches
- && typeof this.objLeaf[this.objArray[i].name]=="undefined"
+
-                                var extName = LilyUtils.stripExtension(this.objArray[i].name);
-                                try {
@@ -139 +147 @@
-                                        this.objDisplay[((this.objArray[i].menuName)?this.objArray[i].menuName:"tmp")]=objName;
-                                        this.objDisplay[objName]=objName;
-                                        this.objLeaf[this.objArray[i].name]=this.objArray[i].name;
-                                } catch(e) {
-                                        LilyDebugWindow.error("External object "+extName.toUpperCase()+" couldn't be loaded: "+e.name + ": " + e.message+" "+e.fileName+",  line: "+e.lineNumber)
-                              
+
-                        }       
-                }       
@@ -156 +163 @@
-        include:function(name) {
-                var o=this.search(name);
- && typeof this.objLeaf[o.name]=="undefined"
+
-                        o.sourceCode=this.load(o.path);                 
-                        var objName = LilyUtils.stripExtension(o.name); 
@@ -165 +172 @@
-                        o.objArguments=LilyUtils.getObjectMetaData(objName).objectArguments;                                                            
-                        this.objDisplay[((o.menuName)?o.menuName:"tmp")]=objName;
-
-
+
-                        return o;
-                }

trunk/lily/lily/chrome/content/utils.js

@@ -1293 +1293 @@
-                        return false;
-                }
+        },
+        
+        /*
+                Method: isLegalID
+                        determine if a string is a valid identifier.
+        
+                Arguments: 
+                        str - string to test
+                
+                Returns: 
+                        bool- true if name contains no illegal characters.
+        */
+        isLegalID: function(str) {
+                return !(/[\-\*\+\)\(\&\#\!\@\$\^\%\–\<\?\"\'\;\:\[\]\}\{\=]/.test(str));
-        },      
-        
@@ -1306 +1320 @@
-        */
-        hasExtension: function(str) {
-, ''
+
-        },      
-