middleman-wizard-template 1.0.0.pre.1 → 1.0.1

data/lib/middleman-wizard-template/template/closure/library/closure/bin/build/source_test.py

@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 The Closure Library Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS-IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+"""Unit test for source."""
+
+__author__ = 'nnaze@google.com (Nathan Naze)'
+
+
+import unittest
+
+import source
+
+
+class SourceTestCase(unittest.TestCase):
+  """Unit test for source.  Tests the parser on a known source input."""
+
+  def testSourceScan(self):
+    test_source = source.Source(_TEST_SOURCE)
+
+    self.assertEqual(set(['foo', 'foo.test']),
+                     test_source.provides)
+    self.assertEqual(set(['goog.dom', 'goog.events.EventType']),
+                     test_source.requires)
+
+  def testSourceScanBase(self):
+    test_source = source.Source(_TEST_BASE_SOURCE)
+
+    self.assertEqual(set(['goog']),
+                     test_source.provides)
+    self.assertEqual(test_source.requires, set())
+
+  def testSourceScanBadBase(self):
+
+    def MakeSource():
+      source.Source(_TEST_BAD_BASE_SOURCE)
+
+    self.assertRaises(Exception, MakeSource)
+
+  def testStripComments(self):
+    self.assertEquals(
+        '\nvar foo = function() {}',
+        source.Source._StripComments((
+            '/* This is\n'
+            '  a comment split\n'
+            '  over multiple lines\n'
+            '*/\n'
+            'var foo = function() {}')))
+
+  def testGoogStatementsInComments(self):
+    test_source = source.Source(_TEST_COMMENT_SOURCE)
+
+    self.assertEqual(set(['foo']),
+                     test_source.provides)
+    self.assertEqual(set(['goog.events.EventType']),
+                     test_source.requires)
+
+
+_TEST_SOURCE = """// Fake copyright notice
+
+/** Very important comment. */
+
+goog.provide('foo');
+goog.provide('foo.test');
+
+goog.require('goog.dom');
+goog.require('goog.events.EventType');
+
+function foo() {
+  // Set bar to seventeen to increase performance.
+  this.bar = 17;
+}
+"""
+
+_TEST_COMMENT_SOURCE = """// Fake copyright notice
+
+goog.provide('foo');
+
+/*
+goog.provide('foo.test');
+ */
+
+/*
+goog.require('goog.dom');
+*/
+
+// goog.require('goog.dom');
+
+goog.require('goog.events.EventType');
+
+function bar() {
+  this.baz = 55;
+}
+"""
+
+_TEST_BASE_SOURCE = """
+var goog = goog || {}; // Identifies this file as the Closure base.
+"""
+
+_TEST_BAD_BASE_SOURCE = """
+goog.provide('goog');
+
+var goog = goog || {}; // Identifies this file as the Closure base.
+"""
+
+
+if __name__ == '__main__':
+  unittest.main()

data/lib/middleman-wizard-template/template/closure/library/closure/bin/build/treescan.py

@@ -0,0 +1,78 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 The Closure Library Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS-IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+"""Shared utility functions for scanning directory trees."""
+
+import os
+import re
+
+
+__author__ = 'nnaze@google.com (Nathan Naze)'
+
+
+# Matches a .js file path.
+_JS_FILE_REGEX = re.compile(r'^.+\.js$')
+
+
+def ScanTreeForJsFiles(root):
+  """Scans a directory tree for JavaScript files.
+
+  Args:
+    root: str, Path to a root directory.
+
+  Returns:
+    An iterable of paths to JS files, relative to cwd.
+  """
+  return ScanTree(root, path_filter=_JS_FILE_REGEX)
+
+
+def ScanTree(root, path_filter=None, ignore_hidden=True):
+  """Scans a directory tree for files.
+
+  Args:
+    root: str, Path to a root directory.
+    path_filter: A regular expression filter.  If set, only paths matching
+      the path_filter are returned.
+    ignore_hidden: If True, do not follow or return hidden directories or files
+      (those starting with a '.' character).
+
+  Yields:
+    A string path to files, relative to cwd.
+  """
+
+  def OnError(os_error):
+    raise os_error
+
+  for dirpath, dirnames, filenames in os.walk(root, onerror=OnError):
+    # os.walk allows us to modify dirnames to prevent decent into particular
+    # directories.  Avoid hidden directories.
+    for dirname in dirnames:
+      if ignore_hidden and dirname.startswith('.'):
+        dirnames.remove(dirname)
+
+    for filename in filenames:
+
+      # nothing that starts with '.'
+      if ignore_hidden and filename.startswith('.'):
+        continue
+
+      fullpath = os.path.join(dirpath, filename)
+
+      if path_filter and not path_filter.match(fullpath):
+        continue
+
+      yield os.path.normpath(fullpath)

data/lib/middleman-wizard-template/template/config.tt

@@ -0,0 +1,66 @@
+use Rack::Static, :urls => ["/closure"]
+
+set :haml, :attr_wrapper => '"'
+
+ready do
+  ::Sprockets.unregister_postprocessor 'application/javascript', ::Sprockets::SafetyColons
+end
+
+# Preview Server
+configure :development do 
+  activate :relative_assets
+end
+
+# Closure Compiler Testing
+configure :build do
+  after_build do |builder|
+    builder.say "Linting"
+    system %Q{gjslint -r source/javascripts/ --exclude_files="source/javascripts/modernizr.js"}
+
+    # Create Goro-ready css file
+    orig_css = File.read("build/stylesheets/site.css")
+    orig_css.gsub!(%Q{@charset "UTF-8";}, "")
+    builder.create_file "build/stylesheets/site.css" do
+      orig_css
+    end
+  end
+
+  # Goro deploy
+  if ENV['GORO']
+    set :layout, false
+    # set :http_prefix, "../../"
+
+    compass_config do |compass|
+      compass.line_comments = false
+    end
+
+    after_build do |builder|
+      builder.say "Optimizing Images (may take a while)"
+      image_optim = ImageOptim.new(:pngout => false)
+      image_optim.optimize_images!(Dir['build/images/**/*.*']) do |unoptimized, optimized|
+        puts unoptimized
+      end
+    end
+  else
+    activate :relative_assets
+    
+    compass_config do |compass|
+      compass.line_comments = false
+    end
+
+    after_build do |builder|
+      builder.say "Compiling to a single file"
+      builder.create_file "build/javascripts/app.min.js" do
+        `closure/library/closure/bin/build/closurebuilder.py --root=closure/library/ --root=build/javascripts/ --namespace="site_name" --output_mode=compiled --compiler_flags="--debug=true" --compiler_jar=closure/compiler/compiler.jar --compiler_flags="--compilation_level=ADVANCED_OPTIMIZATIONS"`
+      end
+
+      orig_file = File.read("build/index.html")
+
+      # Remove goog.base
+      orig_file.gsub!(%Q{<script src="/closure/library/closure/goog/base.js"></script>}, "")
+      builder.create_file "build/index.html" do
+        orig_file
+      end
+    end
+  end
+end

data/lib/middleman-wizard-template/template/shared/Gemfile.tt

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
-gem "middleman", "~> <%= Middleman::VERSION %>"
+gem "middleman", "~> <%= Middleman::VERSION %>"
+gem "image_optim"

data/lib/middleman-wizard-template/template/source/javascripts/app.js

@@ -1,20 +1,18 @@
 //= require "_lib/util"
-//= require "_lib/asset_loader"
 //= require "_lib/raf"
 //= require "_lib/Transform"
 //= require "_lib/Tween"
-//= require "_lib/router"
 
 goog.provide('site_name');
-goog.require('goog.History');
+// goog.require('goog.History');
 goog.require('goog.dom');
 goog.require('goog.dom.classes');
 goog.require('goog.dom.dataset');
 goog.require('goog.dom.query');
 goog.require('goog.events');
-goog.require('goog.net.XhrIo');
+// goog.require('goog.net.XhrIo');
 goog.require('goog.style');
-goog.require('goog.userAgent');
+// goog.require('goog.userAgent');
 
 /**
  * Initialize the app.

data/lib/middleman-wizard-template/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module WizardTemplate
-    VERSION = "1.0.0.pre.1"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: middleman-wizard-template
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
-  prerelease: 6
+  version: 1.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -41,11 +41,24 @@ files:
 - Rakefile
 - lib/middleman-wizard-template.rb
 - lib/middleman-wizard-template/template.rb
+- lib/middleman-wizard-template/template/README.tt
 - lib/middleman-wizard-template/template/closure/compiler/COPYING
 - lib/middleman-wizard-template/template/closure/compiler/README
 - lib/middleman-wizard-template/template/closure/compiler/compiler.jar
 - lib/middleman-wizard-template/template/closure/library/all_tests.html
 - lib/middleman-wizard-template/template/closure/library/alltests.js
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/closurebuilder.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/depstree.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/depstree.pyc
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/depstree_test.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/depswriter.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/jscompiler.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/jscompiler.pyc
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/source.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/source.pyc
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/source_test.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/treescan.py
+- lib/middleman-wizard-template/template/closure/library/closure/bin/build/treescan.pyc
 - lib/middleman-wizard-template/template/closure/library/closure/bin/calcdeps.py
 - lib/middleman-wizard-template/template/closure/library/closure/bin/scopify.py
 - lib/middleman-wizard-template/template/closure/library/closure/css/inlay/g-base.css
@@ -1763,7 +1776,6 @@ files:
 - lib/middleman-wizard-template/template/source/index.html.erb
 - lib/middleman-wizard-template/template/source/javascripts/_lib/Transform.js
 - lib/middleman-wizard-template/template/source/javascripts/_lib/Tween.js
-- lib/middleman-wizard-template/template/source/javascripts/_lib/asset_loader.js
 - lib/middleman-wizard-template/template/source/javascripts/_lib/raf.js
 - lib/middleman-wizard-template/template/source/javascripts/_lib/router.js
 - lib/middleman-wizard-template/template/source/javascripts/_lib/util.js
@@ -1788,13 +1800,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4398009891192626344
+      hash: 282265817994922857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 282265817994922857
 requirements: []
 rubyforge_project: middleman-wizard-template
 rubygems_version: 1.8.23

data/lib/middleman-wizard-template/template/source/javascripts/_lib/asset_loader.js

@@ -1,492 +0,0 @@
-/**
- * Loads resources while providing progress updates.
- * @constructor
- * @param {Object} settings Config vars.
- */
-ww.Loader = function Loader(settings) {
-
-  // merge settings with defaults
-  settings = settings || {};
-
-  // how frequently we poll resources for progress
-  if (settings.statusInterval == null) {
-    settings.statusInterval = 5000; // every 5 seconds by default
-  }
-
-  // delay before logging since last progress change
-  if (settings.loggingDelay == null) {
-    settings.loggingDelay = 20 * 1000; // log stragglers after 20 secs
-  }
-
-  // stop waiting if no progress has been made in the moving time window
-  if (settings.noProgressTimeout == null) {
-    settings.noProgressTimeout = Infinity; // do not stop waiting by default
-  }
-
-  var entries = [],
-    // holds resources to be loaded with their status
-    progressListeners = [],
-    timeStarted, progressChanged = +new Date();
-
-  /**
-   * The status of a resource
-   * @enum {number}
-   */
-  var ResourceState = {
-    QUEUED: 0,
-    WAITING: 1,
-    LOADED: 2,
-    ERROR: 3,
-    TIMEOUT: 4
-  };
-
-  // places non-array values into an array.
-  var ensureArray = function(val) {
-    if (val == null) {
-      return [];
-    }
-
-    if (Array.isArray(val)) {
-      return val;
-    }
-
-    return [val];
-  };
-
-  // add an entry to the list of resources to be loaded
-  this.add = function(resource) {
-
-    // ensure tags are in an object
-    resource.tags = new ww.LoaderTags(resource.tags);
-
-    // ensure priority is set
-    if (resource.priority == null) {
-      resource.priority = Infinity;
-    }
-
-    entries.push({
-      resource: resource,
-      status: ResourceState.QUEUED
-    });
-  };
-
-  this.addProgressListener = function(callback, tags) {
-    progressListeners.push({
-      callback: callback,
-      tags: new ww.LoaderTags(tags)
-    });
-  };
-
-  this.addCompletionListener = function(callback, tags) {
-    progressListeners.push({
-      tags: new ww.LoaderTags(tags),
-      callback: function(e) {
-        if (e.completedCount === e.totalCount) {
-          callback();
-        }
-      }
-    });
-  };
-
-  // creates a comparison function for resources
-  var getResourceSort = function(orderedTags) {
-
-    // helper to get the top tag's order for a resource
-    orderedTags = ensureArray(orderedTags);
-    var getTagOrder = function(entry) {
-      var resource = entry.resource,
-        bestIndex = Infinity;
-      for (var i = 0; i < resource.tags.length; i++) {
-        for (var j = 0; j < Math.min(orderedTags.length, bestIndex); j++) {
-          if (resource.tags[i] == orderedTags[j] && j < bestIndex) {
-            bestIndex = j;
-            if (bestIndex === 0) break;
-          }
-          if (bestIndex === 0) break;
-        }
-      }
-      return bestIndex;
-    };
-    return function(a, b) {
-      // check tag order first
-      var aOrder = getTagOrder(a),
-        bOrder = getTagOrder(b);
-      if (aOrder < bOrder) return -1;
-      if (aOrder > bOrder) return 1;
-
-      // now check priority
-      if (a.priority < b.priority) return -1;
-      if (a.priority > b.priority) return 1;
-      return 0;
-    }
-  };
-
-  this.start = function(orderedTags) {
-    timeStarted = +new Date;
-
-    // first order the resources
-    var compareResources = getResourceSort(orderedTags);
-    entries.sort(compareResources);
-
-    // trigger requests for each resource
-    for (var i = 0, len = entries.length; i < len; i++) {
-      var entry = entries[i];
-      entry.status = ResourceState.WAITING;
-      entry.resource.start(this);
-    }
-
-    // do an initial status check soon since items may be loaded from the cache
-    setTimeout(statusCheck, 100);
-  };
-
-  var statusCheck = function() {
-    var checkAgain = false,
-      noProgressTime = (+new Date()) - progressChanged,
-      timedOut = (noProgressTime >= settings.noProgressTimeout),
-      shouldLog = (noProgressTime >= settings.loggingDelay);
-
-    for (var i = 0, len = entries.length; i < len; i++) {
-      var entry = entries[i];
-      if (entry.status !== ResourceState.WAITING) {
-        continue;
-      }
-
-      // see if the resource has loaded
-      if (entry.resource.checkStatus) {
-        entry.resource.checkStatus();
-      }
-
-      // if still waiting, mark as timed out or make sure we check again
-      if (entry.status === ResourceState.WAITING) {
-        if (timedOut) {
-          entry.resource.onTimeout();
-        } else {
-          checkAgain = true;
-        }
-      }
-    }
-
-    // log any resources that are still pending
-    if (shouldLog && checkAgain) {
-      log();
-    }
-
-    if (checkAgain) {
-      setTimeout(statusCheck, settings.statusInterval);
-    }
-  };
-
-  this.isBusy = function() {
-    for (var i = 0, len = entries.length; i < len; i++) {
-      if ((entries[i].status === ResourceState.QUEUED) ||
-          (entries[i].status === ResourceState.WAITING)) {
-        return true;
-      }
-    }
-    return false;
-  };
-
-  var onProgress = function(resource, statusType) {
-    // find the entry for the resource
-    var entry = null;
-    for (var i = 0, len = entries.length; i < len; i++) {
-      if (entries[i].resource === resource) {
-        entry = entries[i];
-        break;
-      }
-    }
-
-    // we have already updated the status of the resource
-    if (entry == null || entry.status !== ResourceState.WAITING) {
-      return;
-    }
-    entry.status = statusType;
-    progressChanged = +new Date();
-
-    var numResourceTags = resource.tags.length;
-
-    // fire callbacks for interested listeners
-    var numListeners = progressListeners.length;
-    for (var i = 0; i < numListeners; i++) {
-      var listener = progressListeners[i],
-        shouldCall;
-
-      if (listener.tags.length === 0) {
-        // no tags specified so always tell the listener
-        shouldCall = true;
-      } else {
-        // listener only wants to hear about certain tags
-        shouldCall = resource.tags.contains(listener.tags);
-      }
-
-      if (shouldCall) {
-        sendProgress(entry, listener);
-      }
-    }
-  };
-
-  this.onLoad = function(resource) {
-    onProgress(resource, ResourceState.LOADED);
-  };
-  this.onError = function(resource) {
-    onProgress(resource, ResourceState.ERROR);
-  };
-  this.onTimeout = function(resource) {
-    onProgress(resource, ResourceState.TIMEOUT);
-  };
-
-  // sends a progress report to a listener
-  var sendProgress = function(updatedEntry, listener) {
-    // find stats for all the resources the caller is interested in
-    var completed = 0,
-      total = 0;
-    for (var i = 0, len = entries.length; i < len; i++) {
-      var entry = entries[i],
-        includeResource = false;
-
-      if (listener.tags.length === 0) {
-        // no tags specified so always tell the listener
-        includeResource = true;
-      } else {
-        includeResource = entry.resource.tags.contains(listener.tags);
-      }
-
-      if (includeResource) {
-        total++;
-        if ((entry.status === ResourceState.LOADED) ||
-            (entry.status === ResourceState.ERROR) ||
-            (entry.status === ResourceState.TIMEOUT)) {
-          completed++;
-        }
-      }
-    }
-
-    listener.callback({
-      // info about the resource that changed
-      resource: updatedEntry.resource,
-
-      // should we expose StatusType instead?
-      loaded: (updatedEntry.status === ResourceState.LOADED),
-      error: (updatedEntry.status === ResourceState.ERROR),
-      timeout: (updatedEntry.status === ResourceState.TIMEOUT),
-
-      // updated stats for all resources
-      completedCount: completed,
-      totalCount: total
-    });
-  };
-
-  // prints the status of each resource to the console
-  var log = this.log = function(showAll) {
-    if (!window.console) {
-      return;
-    }
-
-    var elapsedSeconds = Math.round((+new Date() - timeStarted) / 1000);
-    window.console.log('ww.Loader elapsed: ' + elapsedSeconds + ' sec');
-
-    for (var i = 0, len = entries.length; i < len; i++) {
-      var entry = entries[i];
-      if (!showAll && entry.status !== ResourceState.WAITING) {
-        continue;
-      }
-
-      var message = 'ww.Loader: #' + i + ' ' + entry.resource.getName();
-      switch (entry.status) {
-        case ResourceState.QUEUED:
-          message += ' (Not Started)';
-          break;
-        case ResourceState.WAITING:
-          message += ' (Waiting)';
-          break;
-        case ResourceState.LOADED:
-          message += ' (Loaded)';
-          break;
-        case ResourceState.ERROR:
-          message += ' (Error)';
-          break;
-        case ResourceState.TIMEOUT:
-          message += ' (Timeout)';
-          break;
-      }
-
-      if (entry.resource.tags.length > 0) {
-        message += ' Tags: [' + entry.resource.tags.join(',') + ']';
-      }
-
-      window.console.log(message);
-    }
-  };
-};
-
-goog.exportSymbol('ww.Loader', ww.Loader);
-
-// Tag object to handle tag intersection; once created not meant to be changed
-// Performance rationale: http://jsperf.com/lists-indexof-vs-in-operator/3
-/**
- * Tags.
- * @constructor
- * @param {Object} values Tag values.
- */
-ww.LoaderTags = function LoaderTags(values) {
-
-  this.array = [];
-  this.object = {};
-  this.value = null; // single value
-  this.length = 0;
-
-  if (values !== null && values !== undefined) {
-    if (Array.isArray(values)) {
-      this.array = values;
-    } else if (typeof values === 'object') {
-      for (var key in values) {
-        this.array.push(key);
-      }
-    } else {
-      this.array.push(values);
-      this.value = values;
-    }
-
-    this.length = this.array.length;
-
-    // convert array values to object with truthy values, used by contains
-    // function below
-    for (var i = 0; i < this.length; i++) {
-      this.object[this.array[i]] = true;
-    }
-  }
-
-  // compare this object with another; return true if they share at least
-  // one value
-  this.contains = function(other) {
-    if (this.length === 0 || other.length === 0) {
-      return false;
-    } else if (this.length === 1 && this.value !== null) {
-      if (other.length === 1) {
-        return this.value === other.value;
-      } else {
-        return other.object.hasOwnProperty(this.value);
-      }
-    } else if (other.length < this.length) {
-      return other.contains(this); // better to loop through the smaller object
-    } else {
-      for (var key in this.object) {
-        if (other.object[key]) {
-          return true;
-        }
-      }
-      return false;
-    }
-  };
-};
-
-// shims to ensure we have newer Array utility methods
-if (!Array.isArray) {
-  /**
-   * Polyfill for isArray
-   * @param {Array} arg The array.
-   * @return {Boolean} Whether it is an array.
-   */
-  Array.isArray = function(arg) {
-    return Object.prototype.toString.call(arg) == '[object Array]';
-  };
-}
-
-goog.exportSymbol('ww.LoaderTags', ww.LoaderTags);
-
-/**
- * Loader plugin to load images.
- * @constructor
- * @param {String} url Url of the Swiffy.
- * @param {Array} tags Array of tag names.
- * @param {Number} priority Load order.
- */
-ww.LoaderImage = function LoaderImage(url, tags, priority) {
-  var self = this,
-    loader = null;
-
-  this.img = new Image();
-  this.tags = tags;
-  this.priority = priority;
-
-  var onReadyStateChange = function() {
-    if (self.img.readyState == 'complete') {
-      removeEventHandlers();
-      loader.onLoad(self);
-    }
-  };
-
-  var onLoad = function() {
-    removeEventHandlers();
-    loader.onLoad(self);
-  };
-
-  var onError = function() {
-    removeEventHandlers();
-    loader.onError(self);
-  };
-
-  var removeEventHandlers = function() {
-    self.unbind('load', onLoad);
-    self.unbind('readystatechange', onReadyStateChange);
-    self.unbind('error', onError);
-  };
-
-  this.start = function(pxloader) {
-    // we need the loader ref so we can notify upon completion
-    loader = pxloader;
-
-    // NOTE: Must add event listeners before the src is set. We
-    // also need to use the readystatechange because sometimes
-    // load doesn't fire when an image is in the cache.
-    self.bind('load', onLoad);
-    self.bind('readystatechange', onReadyStateChange);
-    self.bind('error', onError);
-
-    self.img.src = url;
-  };
-
-  // called by ww.Loader to check status of image (fallback in case
-  // the event listeners are not triggered).
-  this.checkStatus = function() {
-    if (self.img.complete) {
-      removeEventHandlers();
-      loader.onLoad(self);
-    }
-  };
-
-  // called by ww.Loader when it is no longer waiting
-  this.onTimeout = function() {
-    removeEventHandlers();
-    if (self.img.complete) {
-      loader.onLoad(self);
-    } else {
-      loader.onTimeout(self);
-    }
-  };
-
-  // returns a name for the resource that can be used in logging
-  this.getName = function() {
-    return url;
-  };
-
-  // cross-browser event binding
-  this.bind = function(eventName, eventHandler) {
-    if (self.img.addEventListener) {
-      self.img.addEventListener(eventName, eventHandler, false);
-    } else if (self.img.attachEvent) {
-      self.img.attachEvent('on' + eventName, eventHandler);
-    }
-  };
-
-  // cross-browser event un-binding
-  this.unbind = function(eventName, eventHandler) {
-    if (self.img.removeEventListener) {
-      self.img.removeEventListener(eventName, eventHandler, false);
-    } else if (self.img.detachEvent) {
-      self.img.detachEvent('on' + eventName, eventHandler);
-    }
-  };
-};
-
-goog.exportSymbol('ww.LoaderImage', ww.LoaderImage);