Merge branch 'master' into frame-scope

Conflicts: build.xml
thatcher · May 3, 2010 · bdcef03 · bdcef03
2 parents cc6975b + 5483f32
commit bdcef03
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 27 deletions.
diff --git a/build.xml b/build.xml
@@ -122,6 +122,7 @@
             <fileset dir="${SRC_DIR}" includes="platform/core/__global__.js" />
             <fileset dir="${SRC_DIR}" includes="common/intro.js" />
             <fileset dir="${SRC_DIR}" includes="common/__extend__.js" />
+            <fileset dir="${SRC_DIR}" includes="common/__trim__.js" />
             <fileset dir="${SRC_DIR}" includes="platform/core/console.js" />
             <fileset dir="${SRC_DIR}" includes="platform/core/dom.js" />
             <fileset dir="${SRC_DIR}" includes="platform/core/event.js" />
@@ -136,10 +137,10 @@
         <echo message="Finished Building ${CORE_DIST}"/>
         <echo message=""/>
     </target>
-    
+
     <!-- TEST CORE ENV BINDINGS -->
     <target name='core-env-spec'
-            depends='core-env, console'
+            depends='zip'
             description='Test Core Env Specs'>
         <echo message=""/>
         <echo message="Executing Core Env Spec"/>
@@ -184,7 +185,7 @@
 
     <!-- TEST RHINO ENV BINDINGS -->
     <target name='rhino-env-spec'
-            depends='rhino-env, console'
+            depends='zip, rhino-env'
             description='Test Rhino Env Specs'>
         <echo message=""/>
         <echo message="Executing Rhino Env Spec"/>
@@ -213,7 +214,6 @@
             <fileset dir="${SRC_DIR}" includes="console/__global__.js" />
             <fileset dir="${SRC_DIR}" includes="common/intro.js" />
             <fileset dir="${SRC_DIR}" includes="console/console.js" />
-            <fileset dir="${SRC_DIR}" includes="console/json.js" />
             <fileset dir="${SRC_DIR}" includes="common/outro.js" />
         </concat>
         <echo message="Finished Building ${CONSOLE_DIST}"/>
@@ -222,7 +222,7 @@
 
     <!-- TEST CONSOLE SPECIFICATION -->
     <target name='console-spec'
-            depends='console'
+            depends='zip'
             description='Test Console Specs'>
         <echo message=""/>
         <echo message="Executing Console Spec"/>
@@ -238,7 +238,7 @@
 
 
     <!-- BUILD DOM IMPLEMENTATIOM -->
-    <target name="dom" depends="env-platforms">
+    <target name="dom">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${DOM_DIST}" />
@@ -283,7 +283,7 @@
 
     <!-- TEST DOM SPECIFICATION -->
     <target name='dom-spec'
-            depends='dom'
+            depends='zip'
             description='Test DOM Specs'>
         <echo message=""/>
         <echo message="Executing DOM Spec"/>
@@ -298,7 +298,7 @@
     </target>
 
     <!-- BUILD EVENT IMPLEMENTATIOM -->
-    <target name="event" depends="env-platforms">
+    <target name="event">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${EVENT_DIST}" />
@@ -330,7 +330,7 @@
 
     <!-- TEST EVENT SPECIFICATION -->
     <target name='event-spec'
-            depends='event'
+            depends='zip'
             description='Test Event Specs'>
         <echo message=""/>
         <echo message="Executing Event Spec"/>
@@ -345,7 +345,7 @@
     </target>
 
     <!-- BUILD TIMER IMPLEMENTATIOM -->
-    <target name="timer" depends="env-platforms">
+    <target name="timer">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${TIMER_DIST}" />
@@ -367,7 +367,7 @@
 
     <!-- TEST TIMER SPECIFICATION -->
     <target name='timer-spec'
-            depends='timer'
+            depends='zip'
             description='Test Timer Specs'>
         <echo message=""/>
         <echo message="Executing Timer Spec"/>
@@ -382,7 +382,7 @@
     </target>
 
     <!-- BUILD HTML IMPLEMENTATIOM -->
-    <target name="html" depends="env-platforms">
+    <target name="html">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${HTML_DIST}" />
@@ -461,7 +461,7 @@
 
     <!-- TEST HTML SPECIFICATION -->
     <target name='html-spec'
-            depends='html'
+            depends='zip'
             description='Test HTML Specs'>
         <echo message=""/>
         <echo message="Executing HTML Spec"/>
@@ -476,7 +476,7 @@
     </target>
 
     <!-- BUILD CSS IMPLEMENTATIOM -->
-    <target name="css" depends="env-platforms">
+    <target name="css">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${CSS_DIST}" />
@@ -505,7 +505,7 @@
 
     <!-- TEST CSS SPECIFICATION -->
     <target name='css-spec'
-            depends='css'
+            depends='zip'
             description='Test CSS Specs'>
         <echo message=""/>
         <echo message="Executing CSS Spec"/>
@@ -520,7 +520,7 @@
     </target>
 
     <!-- BUILD PARSER IMPLEMENTATIOM -->
-    <target name="parser" depends="env-platforms">
+    <target name="parser">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${PARSER_DIST}" />
@@ -548,7 +548,7 @@
 
     <!-- TEST PARSER SPECIFICATION -->
     <target name='parser-spec'
-            depends='parser'
+            depends='zip'
             description='Test Parser Specs'>
         <echo message=""/>
         <echo message="Executing Parser Spec"/>
@@ -565,7 +565,7 @@
     </target>
 
     <!-- BUILD XMLHTTPREQUEST IMPLEMENTATIOM -->
-    <target name="xhr" depends="env-platforms">
+    <target name="xhr">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${XHR_DIST}" />
@@ -593,7 +593,7 @@
 
     <!-- TEST XHR SPECIFICATION -->
     <target name='xhr-spec'
-            depends='xhr, local-settings'
+            depends='zip, local-settings'
             description='Test XMLHttpRequest Specs'>
         <echo message=""/>
         <echo message="Executing XMLHttpRequest Spec"/>
@@ -608,7 +608,7 @@
     </target>
 
     <!-- BUILD WINDOW IMPLEMENTATIOM -->
-    <target name="window" depends="env-platforms">
+    <target name="window">
         <mkdir dir="${DIST_DIR}" />
         <echo message=""/>
         <echo message="Building ${WINDOW_DIST}" />
@@ -637,7 +637,7 @@
 
     <!-- TEST WINDOW SPECIFICATION -->
     <target name='window-spec'
-            depends='window, local-settings'
+            depends='zip, local-settings'
             description='Test Window Specs'>
         <echo message=""/>
         <echo message="Executing Window Spec"/>
@@ -694,7 +694,7 @@
 
     <target description="jslint quick build - no parser!"
             name="jslint"
-            depends="dom, event, timer, html, xhr, css, window">
+            depends="zip">
         <echo message="Building ${ENV_JSLINT}" />
         <concat destfile="${ENV_JSLINT}">
             <filterchain>
@@ -733,11 +733,27 @@
         <echo message="dist/jslint-out.txt has results" />
     </target>
 
+    <!-- TODO: add back core/env-spec.  Right now it breaks -->
     <target description="Main ENV build"
             name="concat"
-            depends="dom-spec, event-spec, timer-spec,
+            depends="rhino-env-spec,
+                     dom-spec, event-spec, timer-spec,
                      html-spec, parser-spec, xhr-spec,
                      css-spec,  window-spec, scope-spec, frame-spec">
+      <!-- TODO: nice message saying all worked.  Zap /dist on error? -->
+    </target>
+
+    <target name="clean" description="Clean up">
+      <delete dir="${DIST_DIR}" verbose="true" />
+    </target>
+
+
+    <target description="Main ENV concatenator"
+            name="zip"
+            depends="core-env, rhino-env, console,
+                     dom, event, timer,
+                     html, parser, xhr,
+                     css,  window">
         <!-- CORE -->
         <echo message="Building ${ENV_DIST}" />
         <concat destfile="${ENV_DIST}">

diff --git a/src/html/__global__.js b/src/html/__global__.js
@@ -16,6 +16,7 @@ var HTMLDocument,
     HTMLBodyElement,
     HTMLBRElement,
     HTMLButtonElement,
+    CanvasRenderingContext2D,
     HTMLCanvasElement,
     HTMLTableColElement,
     HTMLModElement,

diff --git a/src/html/document.js b/src/html/document.js
@@ -301,10 +301,7 @@ __extend__(HTMLDocument.prototype, {
      * https://developer.mozilla.org/en/DOM/document.URL
      */
     get URL() {
-        return this.location;
-    },
-    set URL(url) {
-        this.location = url;
+        return this.location.href;
     },
 
     /**