build.properties dist/env-js.jar rhino/htmlcleaner2_1.jar rhino/src/META-INF/MANIFEST.MF rhino/src/org/mozilla/javascript/tools/envjs/Global.java rhino/src/org/mozilla/javascript/tools/envjs/Main.java rhino/src/org/mozilla/javascript/tools/envjs/Window.java src/build.js test/vendor/Prototype/.gitignore @@ -1,4 +1,6 @@ dist/env.*.*.*.js dist/env.rhino.*.*.*.js +dist/env-js.*.jar *~ rhino/build +jshost .gitignore @@ -1,4 +1,4 @@ -JAR = java -jar rhino/js.jar +JAR = java -jar dist/env-js.jar test-rhino: ant -emacs test Makefile @@ -3,6 +3,9 @@ task :default => [:test] task :test do - classpath = [File.join(".", "rhino", "ant.jar"), File.join(".", "rhino", "ant-launcher.jar")].join(File::PATH_SEPARATOR) + classpath = [ + File.join(".", "rhino", "ant.jar"), + File.join(".", "rhino", "ant-launcher.jar") + ].join(File::PATH_SEPARATOR) exec "java -cp #{classpath} org.apache.tools.ant.Main -emacs all" end Rakefile @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project name="Env" default="all" basedir="."> <description>Builds, tests, and runs the project Env.</description> - <property name="BUILD_MAJOR" value="0" /> - <property name="BUILD_MINOR" value="9" /> - <property name="BUILD_ID" value="7" /> + <tstamp/> <property name="SRC_DIR" location="src" @@ -28,6 +26,9 @@ location="${PREFIX}/" description="Folder for concatenated, min, lite and packed target" /> + + <property file="build.properties"/> +  <property name="ENV_DIST" location="${DIST_DIR}/env.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}.js" /> @@ -49,6 +50,12 @@  <echo message="Building ${ENV_DIST}" /> <concat destfile="${ENV_DIST}"> + <filterchain> + <replacetokens> + <token key="VERSION" value="${BUILD}"/> + </replacetokens> + </filterchain> + <fileset dir="${SRC_DIR}" includes="build.js" /> <fileset dir="${SRC_DIR}" includes="intro.js" /> <fileset dir="${SRC_DIR}" includes="window/window.js" /> <fileset dir="${SRC_DIR}" includes="platform/xmlsax.js" /> @@ -144,6 +151,12 @@  <echo message="Building ${ENV_RHINO}" /> <concat destfile="${ENV_RHINO}"> + <filterchain> + <replacetokens> + <token key="VERSION" value="${BUILD}"/> + </replacetokens> + </filterchain> + <fileset dir="${SRC_DIR}" includes="build.js" /> <fileset dir="${SRC_DIR}" includes="platform/core.js" /> <fileset dir="${SRC_DIR}" includes="platform/rhino.js" /> <fileset dir="${DIST_DIR}" includes="env.js" /> @@ -153,7 +166,7 @@ </target> <target name="test" description="Run the tests"> - <java fork="true" jar="rhino/env.js.jar" failonerror="true"> + <java fork="true" jar="${DIST_DIR}/env-js.jar" failonerror="true"> <arg value="test/test.js"/> <jvmarg value="-Dfile.encoding=utf-8"/> </java> build.xml @@ -1,22 +1,23 @@ /* + * Envjs env-js.1.0.rc1 * Pure JavaScript Browser Environment * By John Resig <http://ejohn.org/> - * Copyright 2008 John Resig, under the MIT License + * Copyright 2008-2009 John Resig, under the MIT License */ try { - // this goes into the global namespace, but less likely to collide with - // client JS code than methods in Rhino shell (load, print, etc.) - this.__proto__._$envjs$makeObjectIntoWindow$_ = function($w, $env, - $parentWindow, - $initTop){ - - // The Window Object - var __this__ = $w; - $w.__defineGetter__('window', function(){ - return __this__; - }); + + Envjs.window = function($w, + $env, + $parentWindow, + $initTop){ + + // The Window Object + var __this__ = $w; + $w.__defineGetter__('window', function(){ + return __this__; + }); /* * window.js @@ -3546,61 +3547,7 @@ var $handleEndOfNormalOrEmptyElement = function(node, doc, p){ if (node.src && node.src.length > 0){ $debug("getting content document for (i)frame from " + node.src); - // create a new global/window object, such that its methods and - // objects are defined within the scope of the new global. - // Then load content from .src into it - try { - - /* this code semi-duplicated in html/frame.js -- sorry */ - // a blank object, pre-configured to inherit original global - // vvvv from EnvjsRhinoSupraGlobal.java - var frameWindow = createAGlobalObject(); - - // define local variables with content of things that are - // in current global/window, because when the following - // function executes we'll have a new/blank - // global/window and won't be able to get at them.... - var localCopy_mkWinFn = _$envjs$makeObjectIntoWindow$_; - var localCopy_$env = $env; - var localCopy_window = window; - - // a local function gives us a scope that's easy to change - var mkAndLoadNewWindow = function(){ - localCopy_mkWinFn(frameWindow, localCopy_$env, - localCopy_window, localCopy_window.top); - node._content = frameWindow; - frameWindow.location = node.src; - } - - - - // change scope of window object creation functions, so that - // functions/code they create will be scoped to new window - // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java - var oldMalnwScope = getFunctionObjectsScope( - mkAndLoadNewWindow); - var oldMkWinScope = getFunctionObjectsScope( - localCopy_mkWinFn); - var oldLoadScope = getFunctionObjectsScope(load); - var oldLoadScriptScope = getFunctionObjectsScope( - $env.loadLocalScript); - - setFunctionObjectsScope(mkAndLoadNewWindow, frameWindow); - setFunctionObjectsScope(localCopy_mkWinFn, frameWindow); - setFunctionObjectsScope(load, frameWindow); - setFunctionObjectsScope($env.loadLocalScript, frameWindow); - - mkAndLoadNewWindow(); - - // now restore the scope - setFunctionObjectsScope(mkAndLoadNewWindow, oldMalnwScope); - setFunctionObjectsScope(localCopy_mkWinFn, oldMkWinScope); - setFunctionObjectsScope(load, oldLoadScope); - setFunctionObjectsScope($env.loadLocalScript, - oldLoadScriptScope); - } catch(e){ - $error("failed to load frame content: from " + node.src, e); - } + $env.loadFrame(node, $env.location(node.src)); var event = doc.createEvent(); event.initEvent("load"); @@ -5129,6 +5076,262 @@ __extend__(HTMLDocument.prototype, { }); $w.HTMLDocument = HTMLDocument; +$debug("Defining HTMLElement"); +/* +* HTMLElement - DOM Level 2 +*/ +var HTMLElement = function(ownerDocument) { + this.DOMElement = DOMElement; + this.DOMElement(ownerDocument); + + this.$css2props = null; +}; +HTMLElement.prototype = new DOMElement; +__extend__(HTMLElement.prototype, { + get className() { + return this.getAttribute("class")||""; + + }, + set className(val) { + return this.setAttribute("class",trim(val)); + + }, + get dir() { + return this.getAttribute("dir")||"ltr"; + + }, + set dir(val) { + return this.setAttribute("dir",val); + + }, + get id(){ + return this.getAttribute('id')||''; + + }, + set id(id){ + this.setAttribute('id', id); + + }, + get innerHTML(){ + return this.childNodes.xml; + + }, + set innerHTML(html){ + //$debug("htmlElement.innerHTML("+html+")"); + //Should be replaced with HTMLPARSER usage + var doc = new DOMParser(). + parseFromString('<div>'+html+'</div>'); + var parent = doc.documentElement; + while(this.firstChild != null){ + this.removeChild( this.firstChild ); + } + var importedNode; + while(parent.firstChild != null){ + importedNode = this.importNode( + parent.removeChild( parent.firstChild ), true); + this.appendChild( importedNode ); + } + //Mark for garbage collection + doc = null; + }, + get lang() { + return this.getAttribute("lang")||""; + + }, + set lang(val) { + return this.setAttribute("lang",val); + + }, + get offsetHeight(){ + return Number(this.style["height"].replace("px","")); + }, + get offsetWidth(){ + return Number(this.style["width"].replace("px","")); + }, + offsetLeft: 0, + offsetRight: 0, + get offsetParent(){ + /* TODO */ + return; + }, + set offsetParent(element){ + /* TODO */ + return; + }, + scrollHeight: 0, + scrollWidth: 0, + scrollLeft: 0, + scrollRight: 0, + get style(){ + if(this.$css2props === null){ + this.updateCss2Props(); + } + return this.$css2props + }, + updateCss2Props: function() { + this.$css2props = new CSS2Properties({ + onSet: (function(that) { + return function() { that.__setAttribute("style", this.cssText); } + })(this), + cssText:this.getAttribute("style") + }); + }, + __setAttribute: HTMLElement.prototype.setAttribute, + setAttribute: function (name, value) { + this.__setAttribute(name, value); + if (name === "style") { + this.updateCss2Props(); + } + }, + get title() { + return this.getAttribute("title")||""; + + }, + set title(val) { + return this.setAttribute("title",val); + + }, + //Not in the specs but I'll leave it here for now. + get outerHTML(){ + return this.xml; + + }, + scrollIntoView: function(){ + /*TODO*/ + return; + + }, + + onclick: function(event){ + __eval__(this.getAttribute('onclick')||'', this) + }, + // non-ECMA function, but no other way for click events to enter env.js + __click__: function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("click"); + element.dispatchEvent(event); + }, + + ondblclick: function(event){ + __eval__(this.getAttribute('ondblclick')||'', this); + }, + onkeydown: function(event){ + __eval__(this.getAttribute('onkeydown')||'', this); + }, + onkeypress: function(event){ + __eval__(this.getAttribute('onkeypress')||'', this); + }, + onkeyup: function(event){ + __eval__(this.getAttribute('onkeyup')||'', this); + }, + onmousedown: function(event){ + __eval__(this.getAttribute('onmousedown')||'', this); + }, + onmousemove: function(event){ + __eval__(this.getAttribute('onmousemove')||'', this); + }, + onmouseout: function(event){ + __eval__(this.getAttribute('onmouseout')||'', this); + }, + onmouseover: function(event){ + __eval__(this.getAttribute('onmouseover')||'', this); + }, + onmouseup: function(event){ + __eval__(this.getAttribute('onmouseup')||'', this); + } +}); + +var __eval__ = function(script, startingNode){ + if (script == "") + return; // don't assemble environment if no script... + + try{ + var doEval = function(scriptText){ + eval(scriptText); + } + + var listOfScopes = []; + for (var node = startingNode; node != null; node = node.parentNode) + listOfScopes.push(node); + listOfScopes.push(window); + + + var oldScopesArray = $env.configureScope( + doEval, // the function whose scope chain to change + listOfScopes); // last array element is "head" of new chain + doEval.call(startingNode, script); + $env.restoreScope(oldScopesArray); + // oldScopesArray is N-element array of two-element + // arrays. First element is JS object whose scope + // was modified, second is original value to restore. + }catch(e){ + $error(e); + } +}; + +var __registerEventAttrs__ = function(elm){ + if(elm.hasAttribute('onclick')){ + elm.addEventListener('click', elm.onclick ); + } + if(elm.hasAttribute('ondblclick')){ + elm.addEventListener('dblclick', elm.onclick ); + } + if(elm.hasAttribute('onkeydown')){ + elm.addEventListener('keydown', elm.onclick ); + } + if(elm.hasAttribute('onkeypress')){ + elm.addEventListener('keypress', elm.onclick ); + } + if(elm.hasAttribute('onkeyup')){ + elm.addEventListener('keyup', elm.onclick ); + } + if(elm.hasAttribute('onmousedown')){ + elm.addEventListener('mousedown', elm.onclick ); + } + if(elm.hasAttribute('onmousemove')){ + elm.addEventListener('mousemove', elm.onclick ); + } + if(elm.hasAttribute('onmouseout')){ + elm.addEventListener('mouseout', elm.onclick ); + } + if(elm.hasAttribute('onmouseover')){ + elm.addEventListener('mouseover', elm.onclick ); + } + if(elm.hasAttribute('onmouseup')){ + elm.addEventListener('mouseup', elm.onclick ); + } + return elm; +}; + +var __submit__ = function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("submit"); + element.dispatchEvent(event); +}; +var __focus__ = function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("focus"); + element.dispatchEvent(event); +}; +var __blur__ = function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("blur"); + element.dispatchEvent(event); +}; + +$w.HTMLElement = HTMLElement; $debug("Defining HTMLCollection"); /* * HTMLCollection - DOM Level 2 @@ -5810,70 +6013,8 @@ __extend__(HTMLFrameElement.prototype, { this.setAttribute('src', value); if (value && value.length > 0){ - try { - - /* this code semi-duplicated in dom/implementation.js -- sorry */ - var frameWindow; - var makingNewWinFlag = !(this._content); - if (makingNewWinFlag) - // a blank object, inherits from original global - // v EnvjsRhinoSupraGlobal.java - frameWindow = createAGlobalObject(); - else - frameWindow = this._content; - - - // define local variables with content of things that are - // in current global/window, because when the following - // function executes we'll have a new/blank - // global/window and won't be able to get at them.... - var localCopy_mkWinFn = _$envjs$makeObjectIntoWindow$_; - var localCopy_$env = $env; - var localCopy_window = window; - - // a local function gives us something whose scope - // is easy to change - var mkAndLoadNewWindow = function(){ - if (makingNewWinFlag){ - localCopy_mkWinFn(frameWindow, localCopy_$env, - localCopy_window, - localCopy_window.top); - } - - frameWindow.location = value; - } - - - // change scope of window object creation - // functions, so that functions/code they create - // will be scoped to new window object - // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java - var oldMalnwScope = getFunctionObjectsScope( - mkAndLoadNewWindow); - var oldMkWinScope = getFunctionObjectsScope( - localCopy_mkWinFn); - var oldLoadScope = getFunctionObjectsScope(load); - var oldLoadScriptScope = getFunctionObjectsScope( - $env.loadLocalScript); - - setFunctionObjectsScope(mkAndLoadNewWindow, frameWindow); - setFunctionObjectsScope(localCopy_mkWinFn, frameWindow); - setFunctionObjectsScope(load, frameWindow); - setFunctionObjectsScope($env.loadLocalScript, frameWindow); - - mkAndLoadNewWindow(); - this._content = frameWindow; - - // now restore the scope - setFunctionObjectsScope(mkAndLoadNewWindow, oldMalnwScope); - setFunctionObjectsScope(localCopy_mkWinFn, oldMkWinScope); - setFunctionObjectsScope(load, oldLoadScope); - setFunctionObjectsScope($env.loadLocalScript, - oldLoadScriptScope); - } catch(e){ - $error("failed to load frame content: from " + value, e); - } - + $env.loadFrame(this, $env.location(value)); + var event = document.createEvent(); event.initEvent("load"); this.dispatchEvent( event, false ); @@ -10059,12 +10200,12 @@ try{ */ - }; // close function definition begun in 'intro.js' + };// close function definition begun in 'intro.js' - // turn "original" JS interpreter global object into the - // "root" window object; third param value for new window's "parent" - _$envjs$makeObjectIntoWindow$_(this, Envjs, null, this); + // turn "original" JS interpreter global object into the + // "root" window object; third param value for new window's "parent" + Envjs.window(this, Envjs, null, this); } catch(e){ Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" + dist/env.js @@ -1,3 +1,9 @@ +/* + * Envjs env-js.1.0.rc1 + * Pure JavaScript Browser Environment + * By John Resig <http://ejohn.org/> + * Copyright 2008-2009 John Resig, under the MIT License + */ /** * @author thatcher */ @@ -92,6 +98,8 @@ var Envjs = function(){ $env.lang = ''; $env.platform = "Rhino ";//how do we get the version + $env.load = function(){}; + $env.safeScript = function(){ //do nothing }; @@ -160,6 +168,79 @@ var Envjs = function(){ $env.loadInlineScript = function(script){}; + + $env.globalize = function(){}; + $env.getScope = function(){}; + $env.setScope = function(){}; + $env.configureScope = function(){}; + $env.restoreScope = function(){}; + $env.loadFrame = function(frame, url){ + try { + + /* this code semi-duplicated in dom/implementation.js -- sorry */ + var frameWindow, + makingNewWinFlag = !(frame._content); + if (makingNewWinFlag) + // a blank object, inherits from original global + // see org.mozilla.javascript.tools.envjs.Window.java + frameWindow = $env.globalize(); + else + frameWindow = frame._content; + + + // define local variables with content of things that are + // in current global/window, because when the following + // function executes we'll have a new/blank + // global/window and won't be able to get at them.... + var local__window__ = $env.window, + local_env = $env, + local_window = window; + + // a local function gives us something whose scope + // is easy to change + var __frame__ = function(){ + if (makingNewWinFlag){ + local__window__(frameWindow, + local_env, + local_window, + local_window.top); + } + + frameWindow.location = url; + } + + + // change scope of window object creation + // functions, so that functions/code they create + // will be scoped to new window object + // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java + var scopes = { + frame : $env.getScope(__frame__), + window : $env.getScope(local__window__), + global_load: $env.getScope(load), + local_load: $env.getScope($env.loadLocalScript) + }; + + $env.setScope(__frame__, frameWindow); + $env.setScope(local__window__, frameWindow); + $env.setScope($env.load, frameWindow); + $env.setScope($env.loadLocalScript, frameWindow); + + __frame__(); + frame._content = frameWindow; + + // now restore the scope + $env.setScope(__frame__, scopes.frame); + $env.setScope(local__window__, scopes.window); + $env.setScope($env.load, scopes.global_load); + $env.setScope($env.loadLocalScript, scopes.local_load); + + } catch(e){ + $env.error("failed to load frame content: from " + url, e); + } + + }; + })(Envjs);/* * env.rhino.js */ @@ -199,60 +280,60 @@ var Envjs = function(){ var timers = []; $env.timer = function(fn, interval){ - this.fn = fn; - this.interval = interval; - this.at = Date.now() + interval; - this.index = timers.length; - timers[this.index] = this; + this.fn = fn; + this.interval = interval; + this.at = Date.now() + interval; + this.index = timers.length; + timers[this.index] = this; }; $env.timer.prototype.start = function(){}; $env.timer.prototype.stop = function(){ - delete timers[this.index]; + delete timers[this.index]; }; // wait === null: execute any immediately runnable timers and return // wait(n) (n > 0): execute any timers as they fire but no longer than n ms // wait(0): execute any timers as they fire, waiting until there are none left $env.wait = function(wait) { - var i; - var empty; - var after; - var now; - var timer; - var sleep; - if (wait !== 0 && wait !== null && wait !== undefined){ - wait += Date.now(); - } - for (;;) { - for (i in timers){ - timer = timers[i]; - now = Date.now(); - if (timer.at <= now){ - f = timer.fn; - f(); - timer.at += timer.interval; - } - } - empty = true; - sleep = null; - now = Date.now(); - for (i in timers){ - empty = false; - timer = timers[i]; - after = timer.at - now - sleep = (sleep === null || after < sleep) ? after : sleep; - } - sleep = sleep < 0 ? 0 : sleep; - if (empty || - ( wait !== 0 ) && - ( ( sleep > 0 && !wait ) || ( Date.now() + sleep > wait ) ) ) { - break; - } - if (sleep) { - java.lang.Thread.currentThread().sleep(sleep); - } - } + var i; + var empty; + var after; + var now; + var timer; + var sleep; + if (wait !== 0 && wait !== null && wait !== undefined){ + wait += Date.now(); + } + for (;;) { + for (i in timers){ + timer = timers[i]; + now = Date.now(); + if (timer.at <= now){ + f = timer.fn; + f(); + timer.at += timer.interval; + } + } + empty = true; + sleep = null; + now = Date.now(); + for (i in timers){ + empty = false; + timer = timers[i]; + after = timer.at - now + sleep = (sleep === null || after < sleep) ? after : sleep; + } + sleep = sleep < 0 ? 0 : sleep; + if (empty || + ( wait !== 0 ) && + ( ( sleep > 0 && !wait ) || ( Date.now() + sleep > wait ) ) ) { + break; + } + if (sleep) { + java.lang.Thread.currentThread().sleep(sleep); + } + } }; //Since we're running in rhino I guess we can safely assume @@ -382,7 +463,7 @@ var Envjs = function(){ } if(responseHandler){ - responseHandler(); + responseHandler(); } }; @@ -390,27 +471,66 @@ var Envjs = function(){ htmlDocBuilder.setNamespaceAware(false); htmlDocBuilder.setValidating(false); + var htmlCleaner, + cleanDomSerializer, + cleanProperties; $env.parseHTML = function(htmlstring){ - return htmlDocBuilder.newDocumentBuilder().parse( + var domdoc;//what's up dom doc? + if($env.cleanHTML){ + htmlCleaner = htmlCleaner||new org.htmlcleaner.HtmlCleaner(); + cleanDomSerializer = cleanDomSerializer||new org.htmlcleaner.DomSerializer(); + cleanProperties = cleanProperties||new org.htmlcleaner.CleanerProperties(); + domdoc = org.htmlcleaner.DomSerializer.createDOM(htmlCleaner.clean(htmlstring)); + }else{ + domdoc = htmlDocBuilder.newDocumentBuilder().parse( new java.io.ByteArrayInputStream( - (new java.lang.String(htmlstring)).getBytes("UTF8")))+""; + (new java.lang.String(htmlstring)).getBytes("UTF8"))); + } + return domdoc; }; var xmlDocBuilder = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(); xmlDocBuilder.setNamespaceAware(true); - xmlDocBuilder.setValidating(true); + xmlDocBuilder.setValidating(false); $env.parseXML = function(xmlstring){ return xmlDocBuilder.newDocumentBuilder().parse( new java.io.ByteArrayInputStream( - (new java.lang.String(xmlstring)).getBytes("UTF8")))+""; + (new java.lang.String(xmlstring)).getBytes("UTF8"))); }; $env.xpath = function(expression, doc){ - return Packages.javax.xml.xpath. - XPathFactory.newInstance().newXPath(). - evaluate(expression, doc, javax.xml.xpath.XPathConstants.NODESET); + return Packages.javax.xml.xpath. + XPathFactory.newInstance().newXPath(). + evaluate(expression, doc, javax.xml.xpath.XPathConstants.NODESET); + }; + + var jsonmlxslt; + $env.jsonml = function(xmlstring){ + jsonmlxslt = jsonmlxslt||$env.xslt($env.xml2jsonml.toXMLString()); + var jsonml = $env.xslttransform(jsonmlxslt, xmlstring); + //$env.debug('jsonml :\n'+jsonml); + return eval(jsonml); + }; + var transformerFactory; + $env.xslt = function(xsltstring){ + transformerFactory = transformerFactory|| + Packages.javax.xml.transform.TransformerFactory.newInstance(); + return transformerFactory.newTransformer( + new javax.xml.transform.dom.DOMSource( + $env.parseXML(xsltstring) + ) + ); + }; + $env.xslttransform = function(xslt, xmlstring){ + var baos = new java.io.ByteArrayOutputStream(); + xslt.transform( + new javax.xml.transform.dom.DOMSource($env.parseHTML(xmlstring)), + new javax.xml.transform.stream.StreamResult(baos) + ); + return java.nio.charset.Charset.forName("UTF-8"). + decode(java.nio.ByteBuffer.wrap(baos.toByteArray())).toString()+""; }; $env.tmpdir = java.lang.System.getProperty("java.io.tmpdir"); @@ -419,7 +539,10 @@ var Envjs = function(){ $env.os_version = java.lang.System.getProperty("os.version"); $env.lang = java.lang.System.getProperty("user.lang"); $env.platform = "Rhino ";//how do we get the version - + + //injected by org.mozilla.javascript.tools.envjs. + $env.load = load; + $env.safeScript = function(){ //do nothing }; @@ -434,28 +557,36 @@ var Envjs = function(){ $env.debug("loading inline script :" + script.text); var tmpFile = $env.writeToTempFile(script.text, 'js') ; $env.debug("loading " + tmpFile); - load(tmpFile); + $env.load(tmpFile); }; + //injected by org.mozilla.javascript.tools.envjs. + $env.globalize = globalize; + $env.getScope = getScope; + $env.setScope = setScope; + $env.configureScope = configureScope; + $env.restoreScope = restoreScope; + })(Envjs);/* + * Envjs env-js.1.0.rc1 * Pure JavaScript Browser Environment * By John Resig <http://ejohn.org/> - * Copyright 2008 John Resig, under the MIT License + * Copyright 2008-2009 John Resig, under the MIT License */ try { - // this goes into the global namespace, but less likely to collide with - // client JS code than methods in Rhino shell (load, print, etc.) - this.__proto__._$envjs$makeObjectIntoWindow$_ = function($w, $env, - $parentWindow, - $initTop){ - - // The Window Object - var __this__ = $w; - $w.__defineGetter__('window', function(){ - return __this__; - }); + + Envjs.window = function($w, + $env, + $parentWindow, + $initTop){ + + // The Window Object + var __this__ = $w; + $w.__defineGetter__('window', function(){ + return __this__; + }); /* * window.js @@ -3985,61 +4116,7 @@ var $handleEndOfNormalOrEmptyElement = function(node, doc, p){ if (node.src && node.src.length > 0){ $debug("getting content document for (i)frame from " + node.src); - // create a new global/window object, such that its methods and - // objects are defined within the scope of the new global. - // Then load content from .src into it - try { - - /* this code semi-duplicated in html/frame.js -- sorry */ - // a blank object, pre-configured to inherit original global - // vvvv from EnvjsRhinoSupraGlobal.java - var frameWindow = createAGlobalObject(); - - // define local variables with content of things that are - // in current global/window, because when the following - // function executes we'll have a new/blank - // global/window and won't be able to get at them.... - var localCopy_mkWinFn = _$envjs$makeObjectIntoWindow$_; - var localCopy_$env = $env; - var localCopy_window = window; - - // a local function gives us a scope that's easy to change - var mkAndLoadNewWindow = function(){ - localCopy_mkWinFn(frameWindow, localCopy_$env, - localCopy_window, localCopy_window.top); - node._content = frameWindow; - frameWindow.location = node.src; - } - - - - // change scope of window object creation functions, so that - // functions/code they create will be scoped to new window - // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java - var oldMalnwScope = getFunctionObjectsScope( - mkAndLoadNewWindow); - var oldMkWinScope = getFunctionObjectsScope( - localCopy_mkWinFn); - var oldLoadScope = getFunctionObjectsScope(load); - var oldLoadScriptScope = getFunctionObjectsScope( - $env.loadLocalScript); - - setFunctionObjectsScope(mkAndLoadNewWindow, frameWindow); - setFunctionObjectsScope(localCopy_mkWinFn, frameWindow); - setFunctionObjectsScope(load, frameWindow); - setFunctionObjectsScope($env.loadLocalScript, frameWindow); - - mkAndLoadNewWindow(); - - // now restore the scope - setFunctionObjectsScope(mkAndLoadNewWindow, oldMalnwScope); - setFunctionObjectsScope(localCopy_mkWinFn, oldMkWinScope); - setFunctionObjectsScope(load, oldLoadScope); - setFunctionObjectsScope($env.loadLocalScript, - oldLoadScriptScope); - } catch(e){ - $error("failed to load frame content: from " + node.src, e); - } + $env.loadFrame(node, $env.location(node.src)); var event = doc.createEvent(); event.initEvent("load"); @@ -5568,6 +5645,262 @@ __extend__(HTMLDocument.prototype, { }); $w.HTMLDocument = HTMLDocument; +$debug("Defining HTMLElement"); +/* +* HTMLElement - DOM Level 2 +*/ +var HTMLElement = function(ownerDocument) { + this.DOMElement = DOMElement; + this.DOMElement(ownerDocument); + + this.$css2props = null; +}; +HTMLElement.prototype = new DOMElement; +__extend__(HTMLElement.prototype, { + get className() { + return this.getAttribute("class")||""; + + }, + set className(val) { + return this.setAttribute("class",trim(val)); + + }, + get dir() { + return this.getAttribute("dir")||"ltr"; + + }, + set dir(val) { + return this.setAttribute("dir",val); + + }, + get id(){ + return this.getAttribute('id')||''; + + }, + set id(id){ + this.setAttribute('id', id); + + }, + get innerHTML(){ + return this.childNodes.xml; + + }, + set innerHTML(html){ + //$debug("htmlElement.innerHTML("+html+")"); + //Should be replaced with HTMLPARSER usage + var doc = new DOMParser(). + parseFromString('<div>'+html+'</div>'); + var parent = doc.documentElement; + while(this.firstChild != null){ + this.removeChild( this.firstChild ); + } + var importedNode; + while(parent.firstChild != null){ + importedNode = this.importNode( + parent.removeChild( parent.firstChild ), true); + this.appendChild( importedNode ); + } + //Mark for garbage collection + doc = null; + }, + get lang() { + return this.getAttribute("lang")||""; + + }, + set lang(val) { + return this.setAttribute("lang",val); + + }, + get offsetHeight(){ + return Number(this.style["height"].replace("px","")); + }, + get offsetWidth(){ + return Number(this.style["width"].replace("px","")); + }, + offsetLeft: 0, + offsetRight: 0, + get offsetParent(){ + /* TODO */ + return; + }, + set offsetParent(element){ + /* TODO */ + return; + }, + scrollHeight: 0, + scrollWidth: 0, + scrollLeft: 0, + scrollRight: 0, + get style(){ + if(this.$css2props === null){ + this.updateCss2Props(); + } + return this.$css2props + }, + updateCss2Props: function() { + this.$css2props = new CSS2Properties({ + onSet: (function(that) { + return function() { that.__setAttribute("style", this.cssText); } + })(this), + cssText:this.getAttribute("style") + }); + }, + __setAttribute: HTMLElement.prototype.setAttribute, + setAttribute: function (name, value) { + this.__setAttribute(name, value); + if (name === "style") { + this.updateCss2Props(); + } + }, + get title() { + return this.getAttribute("title")||""; + + }, + set title(val) { + return this.setAttribute("title",val); + + }, + //Not in the specs but I'll leave it here for now. + get outerHTML(){ + return this.xml; + + }, + scrollIntoView: function(){ + /*TODO*/ + return; + + }, + + onclick: function(event){ + __eval__(this.getAttribute('onclick')||'', this) + }, + // non-ECMA function, but no other way for click events to enter env.js + __click__: function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("click"); + element.dispatchEvent(event); + }, + + ondblclick: function(event){ + __eval__(this.getAttribute('ondblclick')||'', this); + }, + onkeydown: function(event){ + __eval__(this.getAttribute('onkeydown')||'', this); + }, + onkeypress: function(event){ + __eval__(this.getAttribute('onkeypress')||'', this); + }, + onkeyup: function(event){ + __eval__(this.getAttribute('onkeyup')||'', this); + }, + onmousedown: function(event){ + __eval__(this.getAttribute('onmousedown')||'', this); + }, + onmousemove: function(event){ + __eval__(this.getAttribute('onmousemove')||'', this); + }, + onmouseout: function(event){ + __eval__(this.getAttribute('onmouseout')||'', this); + }, + onmouseover: function(event){ + __eval__(this.getAttribute('onmouseover')||'', this); + }, + onmouseup: function(event){ + __eval__(this.getAttribute('onmouseup')||'', this); + } +}); + +var __eval__ = function(script, startingNode){ + if (script == "") + return; // don't assemble environment if no script... + + try{ + var doEval = function(scriptText){ + eval(scriptText); + } + + var listOfScopes = []; + for (var node = startingNode; node != null; node = node.parentNode) + listOfScopes.push(node); + listOfScopes.push(window); + + + var oldScopesArray = $env.configureScope( + doEval, // the function whose scope chain to change + listOfScopes); // last array element is "head" of new chain + doEval.call(startingNode, script); + $env.restoreScope(oldScopesArray); + // oldScopesArray is N-element array of two-element + // arrays. First element is JS object whose scope + // was modified, second is original value to restore. + }catch(e){ + $error(e); + } +}; + +var __registerEventAttrs__ = function(elm){ + if(elm.hasAttribute('onclick')){ + elm.addEventListener('click', elm.onclick ); + } + if(elm.hasAttribute('ondblclick')){ + elm.addEventListener('dblclick', elm.onclick ); + } + if(elm.hasAttribute('onkeydown')){ + elm.addEventListener('keydown', elm.onclick ); + } + if(elm.hasAttribute('onkeypress')){ + elm.addEventListener('keypress', elm.onclick ); + } + if(elm.hasAttribute('onkeyup')){ + elm.addEventListener('keyup', elm.onclick ); + } + if(elm.hasAttribute('onmousedown')){ + elm.addEventListener('mousedown', elm.onclick ); + } + if(elm.hasAttribute('onmousemove')){ + elm.addEventListener('mousemove', elm.onclick ); + } + if(elm.hasAttribute('onmouseout')){ + elm.addEventListener('mouseout', elm.onclick ); + } + if(elm.hasAttribute('onmouseover')){ + elm.addEventListener('mouseover', elm.onclick ); + } + if(elm.hasAttribute('onmouseup')){ + elm.addEventListener('mouseup', elm.onclick ); + } + return elm; +}; + +var __submit__ = function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("submit"); + element.dispatchEvent(event); +}; +var __focus__ = function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("focus"); + element.dispatchEvent(event); +}; +var __blur__ = function(element){ + var event = new Event({ + target:element, + currentTarget:element + }); + event.initEvent("blur"); + element.dispatchEvent(event); +}; + +$w.HTMLElement = HTMLElement; $debug("Defining HTMLCollection"); /* * HTMLCollection - DOM Level 2 @@ -6249,70 +6582,8 @@ __extend__(HTMLFrameElement.prototype, { this.setAttribute('src', value); if (value && value.length > 0){ - try { - - /* this code semi-duplicated in dom/implementation.js -- sorry */ - var frameWindow; - var makingNewWinFlag = !(this._content); - if (makingNewWinFlag) - // a blank object, inherits from original global - // v EnvjsRhinoSupraGlobal.java - frameWindow = createAGlobalObject(); - else - frameWindow = this._content; - - - // define local variables with content of things that are - // in current global/window, because when the following - // function executes we'll have a new/blank - // global/window and won't be able to get at them.... - var localCopy_mkWinFn = _$envjs$makeObjectIntoWindow$_; - var localCopy_$env = $env; - var localCopy_window = window; - - // a local function gives us something whose scope - // is easy to change - var mkAndLoadNewWindow = function(){ - if (makingNewWinFlag){ - localCopy_mkWinFn(frameWindow, localCopy_$env, - localCopy_window, - localCopy_window.top); - } - - frameWindow.location = value; - } - - - // change scope of window object creation - // functions, so that functions/code they create - // will be scoped to new window object - // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java - var oldMalnwScope = getFunctionObjectsScope( - mkAndLoadNewWindow); - var oldMkWinScope = getFunctionObjectsScope( - localCopy_mkWinFn); - var oldLoadScope = getFunctionObjectsScope(load); - var oldLoadScriptScope = getFunctionObjectsScope( - $env.loadLocalScript); - - setFunctionObjectsScope(mkAndLoadNewWindow, frameWindow); - setFunctionObjectsScope(localCopy_mkWinFn, frameWindow); - setFunctionObjectsScope(load, frameWindow); - setFunctionObjectsScope($env.loadLocalScript, frameWindow); - - mkAndLoadNewWindow(); - this._content = frameWindow; - - // now restore the scope - setFunctionObjectsScope(mkAndLoadNewWindow, oldMalnwScope); - setFunctionObjectsScope(localCopy_mkWinFn, oldMkWinScope); - setFunctionObjectsScope(load, oldLoadScope); - setFunctionObjectsScope($env.loadLocalScript, - oldLoadScriptScope); - } catch(e){ - $error("failed to load frame content: from " + value, e); - } - + $env.loadFrame(this, $env.location(value)); + var event = document.createEvent(); event.initEvent("load"); this.dispatchEvent( event, false ); @@ -10498,12 +10769,12 @@ try{ */ - }; // close function definition begun in 'intro.js' + };// close function definition begun in 'intro.js' - // turn "original" JS interpreter global object into the - // "root" window object; third param value for new window's "parent" - _$envjs$makeObjectIntoWindow$_(this, Envjs, null, this); + // turn "original" JS interpreter global object into the + // "root" window object; third param value for new window's "parent" + Envjs.window(this, Envjs, null, this); } catch(e){ Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" + dist/env.rhino.js @@ -1,6 +1,101 @@ -<project name="rhino" default="all" basedir="."> - <target name="all"> - <ant antfile="src/build.xml" target="combined-jar"/> - </target> + +<project name="Env4Rhino" default="all" basedir="."> + <description> + Compiles rhino-specific extensions to support window-like + scope chains for iframes in env-js. It also adds htmlcleaner + to support the parsing of malformed html. + + The repackaged js.jar is named env-js.jar to facilitate + ease of use as a unified java environment for hosting + env.js browser environment emulation. + + Special thanks to Glen E. Ivey for the rhino extensions, + iframe implementations, among many other contributions. + </description> + <tstamp/> + + <property name="SRC_DIR" + location="src" + description="Source Folder"/> + <property name="BUILD_DIR" + location="build" + description="Build Folder"/> + <property name="CLASS_DIR" + location="${BUILD_DIR}/classes" + description="Compiled Classes Folder"/> + <property name="DIST_DIR" + location="../dist" + description="Distribution Folder"/> + + <property name="RHINO_JAR" + location="js.jar" + description="Rhino JS Engine"/> + <property name="HTMLCLEANER_JAR" + location="htmlcleaner2_1.jar" + description="HTML Cleaner Engine"/> + <property name='JAVA_DEBUG' + value='on'/> + <property name='JAVA_TARGET' + value='1.5'/> + <property name='JAVA_SRC' + value='1.5'/> + <property name='JAR_COMPRESSION' + value='on'/> + + <property file="../build.properties"/> + + <property name="ENV_JAR_DIST" + location="${DIST_DIR}/${BUILD}.jar" /> + <property name="ENV_JAR_LATEST" + location="${DIST_DIR}/${PROJECT}.jar" /> +  + <target name='all' depends='jar'/> + + <target name="init"> + <mkdir dir="${BUILD_DIR}"/> + <mkdir dir="${CLASS_DIR}"/> + <mkdir dir="${DIST_DIR}"/> + </target> + + <target name="compile" depends="init"> + <javac srcdir="${SRC_DIR}" + destdir="${CLASS_DIR}" + includes="**/*.java" + deprecation="on" + classpath="${RHINO_JAR}" + debug="${JAVA_DEBUG}" + target="${JAVA_TARGET}" + source="${JAVA_SRC}"> + </javac> + </target> + + <target name="jar" depends="compile"> + <copy file="${RHINO_JAR}" tofile="${ENV_JAR_DIST}"/> + <jar jarfile="${ENV_JAR_DIST}" + update="true" + basedir="${CLASS_DIR}" + manifest="${SRC_DIR}/META-INF/MANIFEST.MF" + compress="${JAR_COMPRESSION}"> + <fileset dir="${CLASS_DIR}" includes="**/*.class"/> + <zipfileset src="${HTMLCLEANER_JAR}" includes="**/*.class"/> + </jar> + <copy file="${ENV_JAR_DIST}" tofile="${ENV_JAR_LATEST}"/> + </target> </project> rhino/build.xml @@ -30,61 +30,7 @@ var $handleEndOfNormalOrEmptyElement = function(node, doc, p){ if (node.src && node.src.length > 0){ $debug("getting content document for (i)frame from " + node.src); - // create a new global/window object, such that its methods and - // objects are defined within the scope of the new global. - // Then load content from .src into it - try { - - /* this code semi-duplicated in html/frame.js -- sorry */ - // a blank object, pre-configured to inherit original global - // vvvv from EnvjsRhinoSupraGlobal.java - var frameWindow = createAGlobalObject(); - - // define local variables with content of things that are - // in current global/window, because when the following - // function executes we'll have a new/blank - // global/window and won't be able to get at them.... - var localCopy_mkWinFn = _$envjs$makeObjectIntoWindow$_; - var localCopy_$env = $env; - var localCopy_window = window; - - // a local function gives us a scope that's easy to change - var mkAndLoadNewWindow = function(){ - localCopy_mkWinFn(frameWindow, localCopy_$env, - localCopy_window, localCopy_window.top); - node._content = frameWindow; - frameWindow.location = node.src; - } - - - - // change scope of window object creation functions, so that - // functions/code they create will be scoped to new window - // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java - var oldMalnwScope = getFunctionObjectsScope( - mkAndLoadNewWindow); - var oldMkWinScope = getFunctionObjectsScope( - localCopy_mkWinFn); - var oldLoadScope = getFunctionObjectsScope(load); - var oldLoadScriptScope = getFunctionObjectsScope( - $env.loadLocalScript); - - setFunctionObjectsScope(mkAndLoadNewWindow, frameWindow); - setFunctionObjectsScope(localCopy_mkWinFn, frameWindow); - setFunctionObjectsScope(load, frameWindow); - setFunctionObjectsScope($env.loadLocalScript, frameWindow); - - mkAndLoadNewWindow(); - - // now restore the scope - setFunctionObjectsScope(mkAndLoadNewWindow, oldMalnwScope); - setFunctionObjectsScope(localCopy_mkWinFn, oldMkWinScope); - setFunctionObjectsScope(load, oldLoadScope); - setFunctionObjectsScope($env.loadLocalScript, - oldLoadScriptScope); - } catch(e){ - $error("failed to load frame content: from " + node.src, e); - } + $env.loadFrame(node, $env.location(node.src)); var event = doc.createEvent(); event.initEvent("load"); src/dom/implementation.js @@ -181,11 +181,11 @@ var __eval__ = function(script, startingNode){ listOfScopes.push(window); - var oldScopesArray = configureFunctionObjectsScopeChain( + var oldScopesArray = $env.configureScope( doEval, // the function whose scope chain to change listOfScopes); // last array element is "head" of new chain doEval.call(startingNode, script); - restoreScopeOfSetOfObjects(oldScopesArray); + $env.restoreScope(oldScopesArray); // oldScopesArray is N-element array of two-element // arrays. First element is JS object whose scope // was modified, second is original value to restore. src/html/element.js @@ -57,70 +57,8 @@ __extend__(HTMLFrameElement.prototype, { this.setAttribute('src', value); if (value && value.length > 0){ - try { - - /* this code semi-duplicated in dom/implementation.js -- sorry */ - var frameWindow; - var makingNewWinFlag = !(this._content); - if (makingNewWinFlag) - // a blank object, inherits from original global - // v EnvjsRhinoSupraGlobal.java - frameWindow = createAGlobalObject(); - else - frameWindow = this._content; - - - // define local variables with content of things that are - // in current global/window, because when the following - // function executes we'll have a new/blank - // global/window and won't be able to get at them.... - var localCopy_mkWinFn = _$envjs$makeObjectIntoWindow$_; - var localCopy_$env = $env; - var localCopy_window = window; - - // a local function gives us something whose scope - // is easy to change - var mkAndLoadNewWindow = function(){ - if (makingNewWinFlag){ - localCopy_mkWinFn(frameWindow, localCopy_$env, - localCopy_window, - localCopy_window.top); - } - - frameWindow.location = value; - } - - - // change scope of window object creation - // functions, so that functions/code they create - // will be scoped to new window object - // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java - var oldMalnwScope = getFunctionObjectsScope( - mkAndLoadNewWindow); - var oldMkWinScope = getFunctionObjectsScope( - localCopy_mkWinFn); - var oldLoadScope = getFunctionObjectsScope(load); - var oldLoadScriptScope = getFunctionObjectsScope( - $env.loadLocalScript); - - setFunctionObjectsScope(mkAndLoadNewWindow, frameWindow); - setFunctionObjectsScope(localCopy_mkWinFn, frameWindow); - setFunctionObjectsScope(load, frameWindow); - setFunctionObjectsScope($env.loadLocalScript, frameWindow); - - mkAndLoadNewWindow(); - this._content = frameWindow; - - // now restore the scope - setFunctionObjectsScope(mkAndLoadNewWindow, oldMalnwScope); - setFunctionObjectsScope(localCopy_mkWinFn, oldMkWinScope); - setFunctionObjectsScope(load, oldLoadScope); - setFunctionObjectsScope($env.loadLocalScript, - oldLoadScriptScope); - } catch(e){ - $error("failed to load frame content: from " + value, e); - } - + $env.loadFrame(this, $env.location(value)); + var event = document.createEvent(); event.initEvent("load"); this.dispatchEvent( event, false ); src/html/frame.js @@ -1,20 +1,16 @@ -/* - * Pure JavaScript Browser Environment - * By John Resig <http://ejohn.org/> - * Copyright 2008 John Resig, under the MIT License - */ + try { - // this goes into the global namespace, but less likely to collide with - // client JS code than methods in Rhino shell (load, print, etc.) - this.__proto__._$envjs$makeObjectIntoWindow$_ = function($w, $env, - $parentWindow, - $initTop){ + + Envjs.window = function($w, + $env, + $parentWindow, + $initTop){ - // The Window Object - var __this__ = $w; - $w.__defineGetter__('window', function(){ - return __this__; - }); + // The Window Object + var __this__ = $w; + $w.__defineGetter__('window', function(){ + return __this__; + }); src/intro.js @@ -3,12 +3,12 @@ */ - }; // close function definition begun in 'intro.js' + };// close function definition begun in 'intro.js' - // turn "original" JS interpreter global object into the - // "root" window object; third param value for new window's "parent" - _$envjs$makeObjectIntoWindow$_(this, Envjs, null, this); + // turn "original" JS interpreter global object into the + // "root" window object; third param value for new window's "parent" + Envjs.window(this, Envjs, null, this); } catch(e){ Envjs.error("ERROR LOADING ENV : " + e + "\nLINE SOURCE:\n" + src/outro.js @@ -1,3 +1,4 @@ + /** * @author thatcher */ @@ -92,6 +93,8 @@ var Envjs = function(){ $env.lang = ''; $env.platform = "Rhino ";//how do we get the version + $env.load = function(){}; + $env.safeScript = function(){ //do nothing }; @@ -160,4 +163,77 @@ var Envjs = function(){ $env.loadInlineScript = function(script){}; + + $env.globalize = function(){}; + $env.getScope = function(){}; + $env.setScope = function(){}; + $env.configureScope = function(){}; + $env.restoreScope = function(){}; + $env.loadFrame = function(frame, url){ + try { + + /* this code semi-duplicated in dom/implementation.js -- sorry */ + var frameWindow, + makingNewWinFlag = !(frame._content); + if (makingNewWinFlag) + // a blank object, inherits from original global + // see org.mozilla.javascript.tools.envjs.Window.java + frameWindow = $env.globalize(); + else + frameWindow = frame._content; + + + // define local variables with content of things that are + // in current global/window, because when the following + // function executes we'll have a new/blank + // global/window and won't be able to get at them.... + var local__window__ = $env.window, + local_env = $env, + local_window = window; + + // a local function gives us something whose scope + // is easy to change + var __frame__ = function(){ + if (makingNewWinFlag){ + local__window__(frameWindow, + local_env, + local_window, + local_window.top); + } + + frameWindow.location = url; + } + + + // change scope of window object creation + // functions, so that functions/code they create + // will be scoped to new window object + // *FunctionObjectsScope() from EnvjsRhinoSupraGlobal.java + var scopes = { + frame : $env.getScope(__frame__), + window : $env.getScope(local__window__), + global_load: $env.getScope(load), + local_load: $env.getScope($env.loadLocalScript) + }; + + $env.setScope(__frame__, frameWindow); + $env.setScope(local__window__, frameWindow); + $env.setScope($env.load, frameWindow); + $env.setScope($env.loadLocalScript, frameWindow); + + __frame__(); + frame._content = frameWindow; + + // now restore the scope + $env.setScope(__frame__, scopes.frame); + $env.setScope(local__window__, scopes.window); + $env.setScope($env.load, scopes.global_load); + $env.setScope($env.loadLocalScript, scopes.local_load); + + } catch(e){ + $env.error("failed to load frame content: from " + url, e); + } + + }; + })(Envjs); \ No newline at end of file src/platform/core.js @@ -37,60 +37,60 @@ var timers = []; $env.timer = function(fn, interval){ - this.fn = fn; - this.interval = interval; - this.at = Date.now() + interval; - this.index = timers.length; - timers[this.index] = this; + this.fn = fn; + this.interval = interval; + this.at = Date.now() + interval; + this.index = timers.length; + timers[this.index] = this; }; $env.timer.prototype.start = function(){}; $env.timer.prototype.stop = function(){ - delete timers[this.index]; + delete timers[this.index]; }; // wait === null: execute any immediately runnable timers and return // wait(n) (n > 0): execute any timers as they fire but no longer than n ms // wait(0): execute any timers as they fire, waiting until there are none left $env.wait = function(wait) { - var i; - var empty; - var after; - var now; - var timer; - var sleep; - if (wait !== 0 && wait !== null && wait !== undefined){ - wait += Date.now(); - } - for (;;) { - for (i in timers){ - timer = timers[i]; - now = Date.now(); - if (timer.at <= now){ - f = timer.fn; - f(); - timer.at += timer.interval; - } - } - empty = true; - sleep = null; - now = Date.now(); - for (i in timers){ - empty = false; - timer = timers[i]; - after = timer.at - now - sleep = (sleep === null || after < sleep) ? after : sleep; - } - sleep = sleep < 0 ? 0 : sleep; - if (empty || - ( wait !== 0 ) && - ( ( sleep > 0 && !wait ) || ( Date.now() + sleep > wait ) ) ) { - break; - } - if (sleep) { - java.lang.Thread.currentThread().sleep(sleep); - } - } + var i; + var empty; + var after; + var now; + var timer; + var sleep; + if (wait !== 0 && wait !== null && wait !== undefined){ + wait += Date.now(); + } + for (;;) { + for (i in timers){ + timer = timers[i]; + now = Date.now(); + if (timer.at <= now){ + f = timer.fn; + f(); + timer.at += timer.interval; + } + } + empty = true; + sleep = null; + now = Date.now(); + for (i in timers){ + empty = false; + timer = timers[i]; + after = timer.at - now + sleep = (sleep === null || after < sleep) ? after : sleep; + } + sleep = sleep < 0 ? 0 : sleep; + if (empty || + ( wait !== 0 ) && + ( ( sleep > 0 && !wait ) || ( Date.now() + sleep > wait ) ) ) { + break; + } + if (sleep) { + java.lang.Thread.currentThread().sleep(sleep); + } + } }; //Since we're running in rhino I guess we can safely assume @@ -220,7 +220,7 @@ } if(responseHandler){ - responseHandler(); + responseHandler(); } }; @@ -228,27 +228,66 @@ htmlDocBuilder.setNamespaceAware(false); htmlDocBuilder.setValidating(false); + var htmlCleaner, + cleanDomSerializer, + cleanProperties; $env.parseHTML = function(htmlstring){ - return htmlDocBuilder.newDocumentBuilder().parse( + var domdoc;//what's up dom doc? + if($env.cleanHTML){ + htmlCleaner = htmlCleaner||new org.htmlcleaner.HtmlCleaner(); + cleanDomSerializer = cleanDomSerializer||new org.htmlcleaner.DomSerializer(); + cleanProperties = cleanProperties||new org.htmlcleaner.CleanerProperties(); + domdoc = org.htmlcleaner.DomSerializer.createDOM(htmlCleaner.clean(htmlstring)); + }else{ + domdoc = htmlDocBuilder.newDocumentBuilder().parse( new java.io.ByteArrayInputStream( - (new java.lang.String(htmlstring)).getBytes("UTF8")))+""; + (new java.lang.String(htmlstring)).getBytes("UTF8"))); + } + return domdoc; }; var xmlDocBuilder = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(); xmlDocBuilder.setNamespaceAware(true); - xmlDocBuilder.setValidating(true); + xmlDocBuilder.setValidating(false); $env.parseXML = function(xmlstring){ return xmlDocBuilder.newDocumentBuilder().parse( new java.io.ByteArrayInputStream( - (new java.lang.String(xmlstring)).getBytes("UTF8")))+""; + (new java.lang.String(xmlstring)).getBytes("UTF8"))); }; $env.xpath = function(expression, doc){ - return Packages.javax.xml.xpath. - XPathFactory.newInstance().newXPath(). - evaluate(expression, doc, javax.xml.xpath.XPathConstants.NODESET); + return Packages.javax.xml.xpath. + XPathFactory.newInstance().newXPath(). + evaluate(expression, doc, javax.xml.xpath.XPathConstants.NODESET); + }; + + var jsonmlxslt; + $env.jsonml = function(xmlstring){ + jsonmlxslt = jsonmlxslt||$env.xslt($env.xml2jsonml.toXMLString()); + var jsonml = $env.xslttransform(jsonmlxslt, xmlstring); + //$env.debug('jsonml :\n'+jsonml); + return eval(jsonml); + }; + var transformerFactory; + $env.xslt = function(xsltstring){ + transformerFactory = transformerFactory|| + Packages.javax.xml.transform.TransformerFactory.newInstance(); + return transformerFactory.newTransformer( + new javax.xml.transform.dom.DOMSource( + $env.parseXML(xsltstring) + ) + ); + }; + $env.xslttransform = function(xslt, xmlstring){ + var baos = new java.io.ByteArrayOutputStream(); + xslt.transform( + new javax.xml.transform.dom.DOMSource($env.parseHTML(xmlstring)), + new javax.xml.transform.stream.StreamResult(baos) + ); + return java.nio.charset.Charset.forName("UTF-8"). + decode(java.nio.ByteBuffer.wrap(baos.toByteArray())).toString()+""; }; $env.tmpdir = java.lang.System.getProperty("java.io.tmpdir"); @@ -257,7 +296,10 @@ $env.os_version = java.lang.System.getProperty("os.version"); $env.lang = java.lang.System.getProperty("user.lang"); $env.platform = "Rhino ";//how do we get the version - + + //injected by org.mozilla.javascript.tools.envjs. + $env.load = load; + $env.safeScript = function(){ //do nothing }; @@ -272,7 +314,14 @@ $env.debug("loading inline script :" + script.text); var tmpFile = $env.writeToTempFile(script.text, 'js') ; $env.debug("loading " + tmpFile); - load(tmpFile); + $env.load(tmpFile); }; + //injected by org.mozilla.javascript.tools.envjs. + $env.globalize = globalize; + $env.getScope = getScope; + $env.setScope = setScope; + $env.configureScope = configureScope; + $env.restoreScope = restoreScope; + })(Envjs); \ No newline at end of file src/platform/rhino.js rhino/build.properties rhino/env.js.jar rhino/src/build.xml rhino/src/manifest rhino/src/org/wontology/floss/rhino/envjs/EnvjsRhinoGlobal.java rhino/src/org/wontology/floss/rhino/envjs/EnvjsRhinoMain.java rhino/src/org/wontology/floss/rhino/envjs/EnvjsRhinoSupraGlobal.java 404b1be31cbaed0ebfa0e7c86596c48b044c7870 thatcher thatcher@christopher-thatchers-macbook-air.local http://github.com/thatcher/env-js/commit/cb6d649149173d77aa274d4b53c66990e904a5a2 cb6d649149173d77aa274d4b53c66990e904a5a2

2009-08-16T18:02:09-07:00

did some refactoring of Glen E. Iveys substantial iframe contributions to follow the env practices for isolating platform implementation details to the rhino.js source. I also did a little clean up to simplify the repackaging of rhino he worked out, mostly to simplify naming conventions. Great work glen, im push this out as the first 1.0 release candidate. stay tuned for the addition of the html cleaner... c1d8a4866578a868b45bcd46acfb345ffc4fa264 thatcher thatcher@christopher-thatchers-macbook-air.local