Changeset 6929

Timestamp:

12/20/06 22:40:10 (2 years ago)

Author:

jburke

Message:

Fixes #2196: now have a intern-strings option for things that do not use templatePath and templateCssPath. Also moved intern-strings from python into javascript

Location:

trunk

Files:

• buildscripts/build.xml (modified) (1 diff)
• buildscripts/buildUtil.js (modified) (1 diff)
• buildscripts/buildUtil.py (modified) (1 diff)
• buildscripts/internStrings.js (added)
• src/uri/cache.js (added)
• src/widget/DomWidget.js (modified) (3 diffs)
• src/widget/Editor2.js (modified) (3 diffs)
• src/widget/Editor2Plugin/DropDownList.js (modified) (4 diffs)
• src/widget/Editor2Plugin/FindReplace.js (modified) (1 diff)

trunk/buildscripts/build.xml

@@ -813 +813 @@
                 ]]>
                 </script>
-                <script language="jython">
-                        <![CDATA[
-import sys
-# make the python standard library avialable
-sys.path.append(project.resolveFile("lib/pyLib.zip").getPath())
-sys.path.append(project.resolveFile(".").getPath())
-
-# import re
-import os
-from buildUtil import *
-
-print "Interning strings for directory: " + dojo.getProperty("release_dir")
-internTemplateStrings(project.resolveFile(dojo.getProperty("profileFile")).getPath(), dojo.getProperty("dojoLoader"), project.resolveFile(dojo.getProperty("release_dir")).getPath())
-]]>
-                </script>
+                
+                <java jar="./lib/custom_rhino.jar" failonerror="true" fork="true"
+                        logError="true">
+                        <arg value="internStrings.js" />
+                        <arg value="${profileFile}" />
+                        <arg value="${dojoLoader}" />
+                        <arg value="${release_dir}" />
+                </java>
         </target>
         <!-- end intern-strings task -->

trunk/buildscripts/buildUtil.js

@@ -196 +196 @@
 }
 
-
-buildUtil.getPrefixesFromProfile = function(profileFile){
-        //summary: Load the profile file to get resource paths for external modules.
+buildUtil.getDependencyPropertyFromProfile = function(/*String*/profileFile, /*String*/propName){
+        //summary: Gets a dependencies property from the profile file. The value
+        //of the property is assumed to be an array. An array will always be returned,
+        //but it may be an empty array.
+
         //Use new String to make sure we have a JS string (not a Java string)
         //readText is from hostenv_rhino.js, so be sure to load Dojo before calling this function.
         var profileText = new String(readText(profileFile));
-        var result = null;
-        
-        //Extract only dependencies.prefixes.
-        var dependencies = {
-                prefixes: []
-        };
-        
         //Get rid of CR and LFs since they seem to mess with the regexp match.
         //Using the "m" option on the regexp was not enough.
         profileText = profileText.replace(/\r/g, "");
         profileText = profileText.replace(/\n/g, "");
-        
-        var matches = profileText.match(/(dependencies\.prefixes\s*=\s*\[.*\]\s*\;)/m);
+
+
+        var result = [];
+        var matchRegExp = new RegExp("(dependencies\\." + propName + "\\s*=\\s*\\[[^;]*\\s*\\])", "m");
+
+        var matches = profileText.match(matchRegExp);
+        //Create a shell object to hold the evaled properties.
+        var dependencies = {};
+        
         if(matches && matches.length > 0){
                 eval(matches[0]);
-                if(dependencies && dependencies.prefixes && dependencies.prefixes.length > 0){
-                        result = dependencies.prefixes;
-                }
-        }
-
-        return result; //Array of arrays
+                if(dependencies && dependencies[propName] && dependencies[propName].length > 0){
+                        result = dependencies[propName];
+                }
+        }
+
+        return result; //Array
 }
 
 buildUtil.configPrefixes = function(profileFile){
         //summary: Get the resource prefixes from the profile and registers the prefixes with Dojo.
-        var prefixes = this.getPrefixesFromProfile(profileFile);
+        var prefixes = this.getDependencyPropertyFromProfile(profileFile, "prefixes");
         if(prefixes && prefixes.length > 0){
                 for(i = 0; i < prefixes.length; i++){

trunk/buildscripts/buildUtil.py

@@ -10 +10 @@
 import glob
 import string
-
-def escape(instr):
-        out = []
-        for x in xrange(len(instr)):
-                if instr[x] == "\\":
-                        out.append("\\\\")
-                elif instr[x] == "\n":
-                        out.append("\\n")
-                elif instr[x] == "\"":
-                        out.append("\\\"")
-                else:
-                    out.append(instr[x])
-        return string.join(out, "")
-
-def makeResourceUri(resourceName, templatePath, srcRoot, prefixes):
-        # Find best matching prefix.
-        bestPrefix = ""
-        bestPrefixPath = ""
-        if prefixes:
-                for prefix in prefixes:
-                        # Prefix must match from the start of the resourceName string.
-                        if resourceName.find(prefix[0]) == 0:
-                                if len(prefix[0]) > len(bestPrefix):
-                                        bestPrefix = prefix[0]
-                                        bestPrefixPath = prefix[1]
-
-                if bestPrefixPath != "":
-                        # Convert resourceName to a path
-                        resourceName = resourceName.replace(bestPrefix, "", 1);
-                        if resourceName.find(".") == 0:
-                                resourceName = resourceName[1:len(resourceName)]
-                        resourceName = resourceName.replace(".", "/");
-
-                        # Final path construction
-                        finalPath = srcRoot
-                        finalPath += bestPrefixPath + "/"
-                        if resourceName:
-                                finalPath += resourceName + "/"
-                        finalPath += templatePath
-                        
-                        return finalPath
-
-        return srcRoot + templatePath
-
-def regexpMagic(loader, pkgString, srcRoot, prefixes, skiplist=[]):
-        uriMethod = "dojo.uri.dojoUri"
-        #if loader == "xdomain":
-        #       uriMethod = "dojo.uri.dojoUriXd"
-        # "Now they have two problems" -- jwz
-        #       http://en.wikiquote.org/wiki/Jamie_Zawinski
-        matches = re.findall('((templatePath|templateCssPath)\s*(=|:)\s*(dojo\.uri\.(dojo|module)?Uri\(\s*)?[\"\']([\w\.\/]+)[\"\'](([\,\s]*)[\"\']([\w\.\/]*)[\"\'])?(\s*\))?)', pkgString)
-        filePath = ""
-        for x in matches:
-                # Build file path
-                if x[4] == "dojo":
-                        print "Dojo match: " + x[5]
-                        filePath = srcRoot + x[5]
-                        resourceNsName = "dojo:"+x[5];
-                else:
-                        print "Module match: " + x[5] + " and " + x[8]
-                        filePath = makeResourceUri(x[5], x[8], srcRoot, prefixes)
-                        resourceNsName = x[5]+':'+x[8]
-
-                if resourceNsName in skiplist:
-                        print "Skip intern resource " + filePath
-                        continue
-
-                print "Interning resource path: " + filePath
-
-                if x[1] == "templatePath":
-                        # Replace templatePaths
-                        replacement = "templateString" + x[2] + "\"" + escape(open(filePath).read()) + "\""
-                        pkgString = string.replace(pkgString, x[0], replacement)
-                else:
-                        # Dealing with templateCssPath
-                        # For the CSS we need to keep the template path in there
-                        # since the widget loading stuff uses the template path to
-                        # know whether the CSS has been processed yet.
-                        # Could have matched assignment via : or =. Need different statement separators at the end.
-                        assignSeparator = x[2]
-                        statementSeparator = ","
-                        statementPrefix = ""
-
-                        # FIXME: this is a little weak because it assumes a "this" in front of the templateCssPath
-                        # when it is assigned using an "=", as in 'this.templateCssPath = dojo.uri.dojoUri("some/path/to/Css.css");'
-                        # In theory it could be something else, but in practice it is not, and it gets a little too weird
-                        # to figure out, at least for now.
-                        if assignSeparator == "=":
-                                statementSeparator = ";"
-                                statementPrefix = "this."
-
-                        replacement = "templateCssString" + assignSeparator + "\"" + escape(open(filePath).read()) + "\"" + statementSeparator + statementPrefix + x[0]
-                        pkgString = string.replace(pkgString, x[0], replacement)
-
-        return pkgString
-
-def internTemplateStringsInFile(loader, packageFile, srcRoot, prefixes, skiplist):
-                print packageFile
-                pfd = open(packageFile)
-                pkgString = pfd.read()
-                pfd.close()
-
-                pkgString = regexpMagic(loader, pkgString, srcRoot, prefixes, skiplist)
-
-                pfd = open(packageFile, "w")
-                pfd.write(pkgString)
-                pfd.close() # flush is implicit
-
-
-def internXdFiles(loader, xdDir, srcRoot, prefixes, skiplist):
-        xdFiles = glob.glob1(xdDir, "*.xd.js")
-        for name in xdFiles:
-                print "XD INTERNING: " + name
-                internTemplateStringsInFile(loader, xdDir+os.sep+name, srcRoot, prefixes, skiplist)
-
-
-def internTemplateStrings(profileFile, loader="default", packageDir="../release/dojo", srcRoot="../"):
-        #Fix up dojo.js
-        print "loader: " + loader
-        print "packageDir - " + packageDir
-        packageFile = packageDir+"/dojo.js"
-
-
-        #Load the profile file so we can get module prefixes.
-        pfd = open(profileFile)
-        profileString = pfd.read()
-        pfd.close()
-
-        # Parse out the module prefixes and build a python list of lists object.
-        compiledRe = re.compile('(dependencies\.prefixes\s*=\s*(\[\s*([^;]*)\s*\]))', re.DOTALL | re.MULTILINE)
-        matches = compiledRe.findall(profileString)
-
-        if matches:
-                exec("prefixes = " + matches[0][1])
-                print "Using the following prefixes: "
-                print prefixes
-        else:
-                prefixes = []
-
-        skiplistRe =  re.compile('(dependencies\.internSkipList\s*=\s*(\[\s*([^;]*)\s*\]))', re.DOTALL | re.MULTILINE)
-        matches = skiplistRe.findall(profileString)
-
-        if matches:
-                exec("skiplist = " + matches[0][1])
-                print "Using the following skip list: "
-                print skiplist
-        else:
-                skiplist = []
-        #try:
-        internTemplateStringsInFile(loader, packageFile, srcRoot, prefixes, skiplist)
-        #except:
-        #       packageFile = packageDir+"/__package__.js"
-        #       internTemplateStringsInFile(loader, packageFile, srcRoot)
-
-        #If doing xdomain, then need to fix up the .xd.js files in the widget subdir.
-        #Hack alert! I am not patient enough to figure out how to do dir recursion
-        #in python right now.
-        internXdFiles(loader, packageDir+"/src/widget", srcRoot, prefixes, skiplist)
-        internXdFiles(loader, packageDir+"/src/widget/html", srcRoot, prefixes, skiplist)
-        internXdFiles(loader, packageDir+"/src/widget/svg", srcRoot, prefixes, skiplist)
-        internXdFiles(loader, packageDir+"/src/widget/vml", srcRoot, prefixes, skiplist)
-
 
 def replaceVersion(fileName, version):

trunk/src/widget/DomWidget.js

@@ -55 +55 @@
                 }
         }
+
         if((!obj.templateString)&&(!avoidCache)){
                 obj.templateString = templateString || ts["string"];
         }
+        if(obj.templateString){
+                obj.templateString = this._sanitizeTemplateString(obj.templateString);
+        }
+
         if((!obj.templateNode)&&(!avoidCache)){
                 obj.templateNode = ts["node"];
@@ -64 +69 @@
                 // fetch a text fragment and assign it to templateString
                 // NOTE: we rely on blocking IO here!
-                var tstring = dojo.hostenv.getText(tpath);
-                if(tstring){
-                        // strip <?xml ...?> declarations so that external SVG and XML
-                        // documents can be added to a document without worry
-                        tstring = tstring.replace(/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, "");
-                        var matches = tstring.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
-                        if(matches){
-                                tstring = matches[1];
-                        }
-                }else{
-                        tstring = "";
-                }
+                var tstring = this._sanitizeTemplateString(dojo.hostenv.getText(tpath));
 
                 obj.templateString = tstring;
@@ -86 +80 @@
         }
 }
+
+dojo.widget._sanitizeTemplateString = function(/*String*/tString){
+        //summary: Strips <?xml ...?> declarations so that external SVG and XML
+        //documents can be added to a document without worry. Also, if the string
+        //is an HTML document, only the part inside the body tag is returned.
+        if(tString){
+                tString = tString.replace(/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im, "");
+                var matches = tString.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
+                if(matches){
+                        tString = matches[1];
+                }
+        }else{
+                tString = "";
+        }
+        return tString; //String
+}
+
 dojo.widget._templateCache.dummyCount = 0;
 

trunk/src/widget/Editor2.js

@@ -5 +5 @@
 dojo.require("dojo.widget.Editor2Toolbar");
 dojo.require("dojo.i18n.common");
+dojo.require("dojo.uri.cache");
 dojo.requireLocalization("dojo.widget", "Editor2");
 dojo.requireLocalization("dojo.widget", "Editor2BrowserCommand");
@@ -206 +207 @@
                 // toolbarTemplatePath: dojo.uri.Uri
                 //              to specify the template file for the toolbar
-                toolbarTemplatePath: dojo.uri.dojoUri("src/widget/templates/EditorToolbarOneline.html"),
+                toolbarTemplatePath: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/EditorToolbarOneline.html")),
 
                 // toolbarTemplateCssPath: dojo.uri.Uri
                 //              to specify the css file for the toolbar
-                toolbarTemplateCssPath: dojo.uri.dojoUri("src/widget/templates/EditorToolbar.css"),
+                toolbarTemplateCssPath: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/EditorToolbar.css")),
 
                 // toolbarPlaceHolder: String
                 //              element id to specify where to attach the toolbar
                 toolbarPlaceHolder: '',
-
-//              toolbarTemplatePath: dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbarFCKStyle.html"),
-//              toolbarTemplateCssPath: dojo.uri.dojoUri("src/widget/templates/Editor2/FCKDefault/EditorToolbarFCKStyle.css"),
 
                 _inSourceMode: false,
@@ -260 +258 @@
                                 if(!this.toolbarWidget){
                                                 var tbOpts = {shareGroup: this.toolbarGroup, parent: this, lang: this.lang};
-                                                tbOpts.templatePath = this.toolbarTemplatePath;
+                                                tbOpts.templateString = dojo.uri.cache.get(this.toolbarTemplatePath);
                                                 if(this.toolbarTemplateCssPath){
                                                         tbOpts.templateCssPath = this.toolbarTemplateCssPath;
+                                                        tbOpts.templateCssString = dojo.uri.cache.get(this.toolbarTemplateCssPath);
                                                 }
                                                 if(this.toolbarPlaceHolder){

trunk/src/widget/Editor2Plugin/DropDownList.js

@@ -51 +51 @@
                         this._contentPane = dojo.widget.createWidget("ContentPane", {preload: 'true'});
                         this._contentPane.addOnLoad(this, "setup");
-                        this._contentPane.setUrl(this.href);
+                        this._contentPane.setContent(dojo.uri.cache.get(this.href));
                 }
         },
@@ -101 +101 @@
         // summary: dojo.widget.Editor2ToolbarFormatBlockSelect is an improved format block setting item
 
-        href: dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FormatBlock.html"),
+        href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FormatBlock.html")),
 
         setup: function(){
@@ -172 +172 @@
         // summary: dojo.widget.Editor2ToolbarFontSizeSelect provides a dropdown list for setting fontsize
 
-        href: dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FontSize.html"),
+        href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FontSize.html")),
 
         setup: function(){
@@ -240 +240 @@
 dojo.declare("dojo.widget.Editor2ToolbarFontNameSelect", dojo.widget.Editor2ToolbarFontSizeSelect, {
         // summary: dojo.widget.Editor2ToolbarFontNameSelect provides a dropdown list for setting fontname
-        href: dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FontName.html")
-});
+        href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/EditorToolbar_FontName.html"))
+});

trunk/src/widget/Editor2Plugin/FindReplace.js

@@ -51 +51 @@
                                 {contentFile: "dojo.widget.Editor2Plugin.FindReplaceDialog", 
                                 contentClass: "Editor2ReplaceDialog",
-                                href: dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/replace.html"), 
+                                href: dojo.uri.cache.allow(dojo.uri.dojoUri("src/widget/templates/Editor2/Dialog/replace.html")), 
                                 title: "Replace", width: "350px", height: "200px", modal: false});
                 }