LAZR Javascript Library

Merge lp:~sidnei/lazr-js/yui-3.0.0-redux into lp:lazr-js

yui-3.0.0-redux
Merge into toolchain

Proposed by Sidnei da Silva on 2009-10-21

Status:	Merged
Approved by:	Edwin Grubbs on 2009-10-23
Approved revision:	154
Merged at revision:	not available
Proposed branch:	lp:~sidnei/lazr-js/yui-3.0.0-redux
Merge into:	lp:lazr-js
Diff against target:	159000 lines 0 files modified
To merge this branch:	bzr merge lp:~sidnei/lazr-js/yui-3.0.0-redux
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Edwin Grubbs (community)	code	2009-10-21	Approve on 2009-10-23
Review via email: mp+13743@code.launchpad.net

Commit message

Update to YUI 3.0.0.

Revision history for this message

Sidnei da Silva (sidnei) wrote on 2009-10-21:

- Updates YUI to 3.0.0
- Some cleanup in FormOverlay

Revision history for this message

Sidnei da Silva (sidnei) wrote on 2009-10-21:

Since the branch is large due to the inclusion of YUI 3.0.0, I've made a smaller incremental diff from the base branch (lp:~sidnei/lazr-js/jstestdriver-support).

- https://pastebin.canonical.com/23675/

Revision history for this message

Edwin Grubbs (edwin-grubbs) wrote on 2009-10-22:

Download full text (21.6 KiB)

Hi Sidnei,

I'm glad I didn't have to do all this work. Thanks. I have quite a few
questions, so I'm marking this

needs-fixing

-Edwin

>=== modified file 'examples/inlineeditor/index.html'
>--- examples/inlineeditor/index.html 2009-10-21 17:35:08.000000000 -0500
>+++ new 2009-10-21 17:31:07.000000000 -0500
> var multiline_text = new Y.EditableText({
>- contentBox: '#edit-description',
>- multiline: true,
>- buttons: 'top'
>+ contentBox: '#multiline_text',
>+ multi_line: true,
>+ size: 70
> });
> multiline_text.render();
>
>- // Add the 2 second delay to the underlying editor widget.
>- multiline_text.editor.plug({fn:DelayedSavePlugin});

Why was this removed?

>+ // XXX remove this when done writing the *error CSS stuff.
>+ // editor.editor.showError("Empty text is unacceptable!");
>+ // editor.show_editor();

Why were these comments added?

> });
> </script>
>
>=== modified file 'src-js/lazrjs/choiceedit/tests/choiceedit.js'
>--- src-js/lazrjs/choiceedit/tests/choiceedit.js 2009-10-19 18:16:13 +0000
>+++ src-js/lazrjs/choiceedit/tests/choiceedit.js 2009-10-21 22:29:49 +0000
>@@ -4,7 +4,7 @@
> base: '../../yui/current/build/',
> filter: 'raw',
> combine: false
>- }).use('lazr.choiceedit', 'lazr.testing.runner', 'node', 'event', 'yuitest', 'widget-stack', 'console', function(Y) {
>+ }).use('lazr.choiceedit', 'lazr.testing.runner', 'node', 'event', 'widget-stack', 'console', function(Y) {

Line too long.

Hi Sidnei,

I'm glad I didn't have to do all this work. Thanks. I have quite a few
questions, so I'm marking this

needs-fixing

-Edwin

>=== modified file 'examples/inlineeditor/index.html'
>--- examples/inlineeditor/index.html	2009-10-21 17:35:08.000000000 -0500
>+++ new	2009-10-21 17:31:07.000000000 -0500
>     var multiline_text = new Y.EditableText({
>-        contentBox: '#edit-description',
>-        multiline: true,
>-        buttons: 'top'
>+        contentBox: '#multiline_text',
>+        multi_line: true,
>+        size: 70
>     });
>     multiline_text.render();
> 
>-    // Add the 2 second delay to the underlying editor widget.
>-    multiline_text.editor.plug({fn:DelayedSavePlugin});

Why was this removed?

>+    // XXX remove this when done writing the *error CSS stuff.
>+    // editor.editor.showError("Empty text is unacceptable!");
>+    // editor.show_editor();

Why were these comments added?

> });
>   </script>
> 
>=== modified file 'src-js/lazrjs/choiceedit/tests/choiceedit.js'
>--- src-js/lazrjs/choiceedit/tests/choiceedit.js	2009-10-19 18:16:13 +0000
>+++ src-js/lazrjs/choiceedit/tests/choiceedit.js	2009-10-21 22:29:49 +0000
>@@ -4,7 +4,7 @@
>     base: '../../yui/current/build/',
>     filter: 'raw',
>     combine: false
>-    }).use('lazr.choiceedit', 'lazr.testing.runner', 'node', 'event', 'yuitest', 'widget-stack', 'console', function(Y) {
>+    }).use('lazr.choiceedit', 'lazr.testing.runner', 'node', 'event', 'widget-stack', 'console', function(Y) {

Line too long.

> // Local aliases
> var Assert = Y.Assert,
>
>=== modified file 'src-js/lazrjs/formoverlay/tests/formoverlay.js'
>--- src-js/lazrjs/formoverlay/tests/formoverlay.js	2009-10-20 13:47:36 +0000
>+++ src-js/lazrjs/formoverlay/tests/formoverlay.js	2009-10-21 22:29:49 +0000
>@@ -1,11 +1,11 @@
> /* Copyright (c) 2008, Canonical Ltd. All rights reserved. */
> 
> YUI({
>-    base: '../../yui/3.0.0pr2/build/',
>+    base: '../../yui/current/build/',
>     filter: 'raw',
>     combine: false
>     }).use('lazr.formoverlay', 'lazr.testing.runner',
>-           'lazr.testing.mockio', 'node', 'event', 'yuitest', 'dump',
>+           'lazr.testing.mockio', 'node', 'event', 'dump',
>            'console', function(Y) {
> 
> var Assert = Y.Assert;  // For easy access to isTrue(), etc.
>@@ -20,6 +20,17 @@
>     Y.Event.simulate(rawnode, evtype, options);
> }
> 
>+/* Helper function to cleanup and destroy a form overlay instance */
>+function cleanup_form_overlay(form_overlay) {
>+    if (form_overlay.get('rendered')) {
>+        var bb = form_overlay.get('boundingBox');
>+        bb.get('parentNode').removeChild(bb);
>+    }
>+
>+    // Kill the widget itself.
>+    form_overlay.destroy();
>+}
>+
> /* Helper function that creates a new form overlay instance. */
> function make_form_overlay(cfg) {
>     var form_overlay = new Y.lazr.FormOverlay(cfg);
>@@ -52,17 +63,7 @@
> 
>     tearDown: function() {
>         window.top.resizeTo(this.width, this.height);
>-        this.cleanUp(this.form_overlay);
>-    },
>-
>-    cleanUp: function(form_overlay) {
>-        if (form_overlay.get('rendered')) {
>-            var bb = form_overlay.get('boundingBox');
>-            bb.get('parentNode').removeChild(bb);
>-        }
>-
>-        // Kill the widget itself.
>-        form_overlay.destroy();
>+        cleanup_form_overlay(this.form_overlay);
>     },
> 
>     test_form_overlay_can_be_instantiated: function() {
>@@ -71,45 +72,45 @@
>             Y.lazr.FormOverlay,
>             overlay,
>             "Form overlay could not be instantiated.");
>+        cleanup_form_overlay(overlay);
>     },
> 
>     // This fails because YUI adds an extra div for some reason.
>     // If and when this is fixed, and this passes, we'll need to
>     // update test_form_content_in_bodyContent below.
>-    _should: {
>-        fail: {test_bodyContent_is_single_node: true}
>-    },
>+    // _should: {
>+    //     fail: {test_bodyContent_is_single_node: true}
>+    // },

If the following method is passing, can we get rid of the above
configuration and comment?

>     test_bodyContent_is_single_node: function() {
>         Assert.areEqual(
>             1,
>-            this.form_overlay.get("bodyContent").size(),
>+            this.form_overlay.getStdModNode("body").size(),
>             "The bodyContent should be a single node, not a node list.");
>     },
> 
>     test_form_content_in_bodyContent: function() {
>-        // The form_content should be included in the bodyContent of the
>+        // The form_content should be included in the body of the
>         // overlay during initialization.
>-        var body_content = this.form_overlay.get("bodyContent");
>+        var body_content = this.form_overlay.getStdModNode("body");
> 
>         // Ensure the body_content contains our form node.
>         // Note: see failing test_bodyContent_is_single_node above for why
>         // an index is used here.

Can we get rid of the note in the comment?

>         Assert.isTrue(
>-            body_content.contains(this.form_overlay.form_node)[1],
>+            body_content.contains(this.form_overlay.form_node),
>             "The form node is part of the body content.");
> 
>         // And then make sure that the user-supplied form_content is
>         // included in the form node:
>         Assert.areNotEqual(
>-            body_content.get("innerHTML")[1].search(
>+            body_content.get("innerHTML").search(
>                 this.form_overlay.get("form_content")));
>     },
> 
>     test_first_input_has_focus: function() {
>         // The first input element in the form content should have
>         // focus.
>-
>         var first_input = this.form_overlay.form_node.query('#field1');
> 
>         // Hide the overlay and ensure that the first input does not
>@@ -129,7 +130,7 @@
>             });
>         };
> 
>-        Y.on('focus', onFocus, first_input);
>+        first_input.on('focus', onFocus);
> 
>         this.form_overlay.show();
> 
>@@ -139,12 +140,12 @@
>     test_form_submit_in_bodyContent: function() {
>         // The bodyContent should include the submit button.
> 
>-        var body_content = this.form_overlay.get("bodyContent");
>+        var body_content = this.form_overlay.getStdModNode("body");
>         // Note: see failing test_bodyContent_is_single_node above for why
>         // an index is used here.
>         Assert.isTrue(
>             body_content.contains(
>-                this.form_overlay.get("form_submit_button"))[1],
>+                this.form_overlay.get("form_submit_button")),
>             "The bodyContent includes the form_submit_button.");
>     },
> 
>@@ -165,18 +166,18 @@
>             form_overlay.form_node.contains(submit_button),
>             "The form should include the users submit button.");
> 
>-        this.cleanUp(form_overlay);
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_form_cancel_in_bodyContent: function() {
>         // The bodyContent should include the cancel button.
> 
>-        var body_content = this.form_overlay.get("bodyContent");
>+        var body_content = this.form_overlay.getStdModNode("body");
>         // Note: see failing test_bodyContent_is_single_node above for why
>         // an index is used here.
>         Assert.isTrue(
>             body_content.contains(
>-                this.form_overlay.get("form_cancel_button"))[1],
>+                this.form_overlay.get("form_cancel_button")),
>             "The bodyContent includes the form_cancel_button.");
>     },
> 
>@@ -197,7 +198,7 @@
>             form_overlay.form_node.contains(cancel_button),
>             "The form should include the users cancel button.");
> 
>-        this.cleanUp(form_overlay);
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_hide_when_cancel_clicked: function() {
>@@ -223,11 +224,11 @@
> 
>         this.form_overlay.showError("My special error");
> 
>-        var body_content = this.form_overlay.get("bodyContent");
>+        var body_content = this.form_overlay.getStdModNode("body");
>         // Note: see failing test_bodyContent_is_single_node above for why
>         // an index is used here.
>         Assert.areNotEqual(
>-            body_content.get("innerHTML")[1].search("My special error"),
>+            body_content.get("innerHTML").search("My special error"),
>             -1,
>             "The error text was included in the body content.");
>     },
>@@ -238,12 +239,12 @@
>         // chars. Not sure what to do about unicode, for eg.
>         this.form_overlay.showError("<h2>My special error</h2>");
> 
>-        var body_content = this.form_overlay.get("bodyContent");
>+        var body_content = this.form_overlay.getStdModNode("body");
>         // Note: see failing test_bodyContent_is_single_node above for why
>         // an index is used here.
>         Assert.areEqual(
>             -1,
>-            body_content.get("innerHTML")[1].search("<h2>"),
>+            body_content.get("innerHTML").search("<h2>"),
>             "The tags were stripped from the error message.");
>     },
> 
>@@ -251,9 +252,9 @@
>         // The error message should be cleared from the body content.
>         this.form_overlay.showError("My special error");
>         this.form_overlay.clearError();
>-        var body_content = this.form_overlay.get("bodyContent");
>+        var body_content = this.form_overlay.getStdModNode("body");
>         Assert.areEqual(
>-            body_content.get("innerHTML")[1].search("My special error"),
>+            body_content.get("innerHTML").search("My special error"),
>             -1,
>             "The error text is cleared from the body content.");
>     },
>@@ -309,6 +310,7 @@
>         Assert.isTrue(
>             callback_called,
>             "The form_submit_callback should be called.");
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_submit_with_callback_prevents_propagation: function() {
>@@ -338,6 +340,7 @@
>             Assert.isFalse(
>                 event_was_propagated,
>                 "The onsubmit event should not be propagated.");
>+            cleanup_form_overlay(form_overlay);
>         }, 3000);
>     },
> 
>@@ -356,6 +359,8 @@
>                 Assert.isTrue(event_was_propagated,
>                     "The normal form submission event is propagated as " +
>                     "normal when no callback is provided.");
>+                cleanup_form_overlay(form_overlay);
>+
>             });
>             e.preventDefault();
>         };
>@@ -386,6 +391,7 @@
>             '{field1 => [val1], field2 => [val2], field3 => [val3]}',
>             Y.dump(form_overlay.getFormData()),
>             "The getFormData method returns simple input data correctly.");
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_getFormData_returns_inputs_nested_several_levels: function() {
>@@ -410,6 +416,7 @@
>             '{field1 => [val1], field2 => [val2], field3 => [val3]}',
>             Y.dump(form_overlay.getFormData()),
>             "The getFormData method returns simple input data correctly.");
>+        cleanup_form_overlay(form_overlay);
> 
>     },
> 
>@@ -429,6 +436,7 @@
>         Assert.isTrue(
>             form_overlay.form_node.contains(input_node),
>             "Failed to pass the form content as a Y.Node instance.");
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_form_content_loaded_from_url_success: function() {
>@@ -459,6 +467,7 @@
>         Assert.areEqual(
>             external_form_content, form_node_text.match(external_form_content),
>             "Failed to render the form.");
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_form_content_loaded_from_url_failure: function() {
>@@ -486,6 +495,7 @@
>         Assert.areEqual(
>             error_message, form_node_text.match(error_message),
>             "Failed to render the error message.");
>+        cleanup_form_overlay(form_overlay);
>     },
> 
>     test_form_content_loaded_from_url_bind_submit: function() {
>@@ -515,6 +525,7 @@
>             "input[type=submit]",
>             'click');
>         Assert.isTrue(callback_called, "Submit button didn't get hooked up.");
>+        cleanup_form_overlay(form_overlay);
>     }
> }));
> 
>
>=== modified file 'src-js/lazrjs/overlay/tests/overlay.js'
>--- src-js/lazrjs/overlay/tests/overlay.js	2009-10-19 18:16:13 +0000
>+++ src-js/lazrjs/overlay/tests/overlay.js	2009-10-21 22:29:49 +0000
>@@ -4,7 +4,7 @@
>     base: '../../yui/current/build/',
>     filter: 'raw',
>     combine: false
>-    }).use('lazr.overlay', 'lazr.testing.runner', 'node', 'event', 'yuitest', 'widget-stack', 'console', function(Y) {
>+    }).use('lazr.overlay', 'lazr.testing.runner', 'node', 'event', 'widget-stack', 'console', function(Y) {

Line too long.

> // KeyCode for escape
> var ESCAPE = 27;
>@@ -85,8 +85,8 @@
>     },
> 
>     test_overlay_can_hide_progressbar: function() {
>-        this.overlay = new Y.lazr.PrettyOverlay();
>-        this.overlay.render({progressbar: false});
>+        this.overlay = new Y.lazr.PrettyOverlay({progressbar: false});
>+        this.overlay.render();
>         var bb = this.overlay.get('boundingBox');
>         bb.set('headerContent', 'ALL HAIL DISCORDIA!');
>         Assert.isNull(
>@@ -106,8 +106,8 @@
>     },
> 
>     test_overlay_can_hide_steptitle: function() {
>-        this.overlay = new Y.lazr.PrettyOverlay();
>-        this.overlay.render({progressbar: false});
>+        this.overlay = new Y.lazr.PrettyOverlay({progressbar: false});
>+        this.overlay.render();
>         var bb = this.overlay.get('boundingBox');
>         bb.set('headerContent', 'ALL HAIL DISCORDIA!');
>         Assert.isNull(
>
>=== modified file 'src-js/lazrjs/picker/picker.js'
>--- src-js/lazrjs/picker/picker.js	2009-07-06 16:18:36 +0000
>+++ src-js/lazrjs/picker/picker.js	2009-10-21 22:29:49 +0000
>@@ -204,7 +204,7 @@
>         var options = this.get(BATCHES);
> 
>         // Clear previous batches.
>-        Y.Event.purgeElement(this.batches_box, true);
>+        Y.Event.purgeElement(this._batches_box, true);
>         this._batches_box.set('innerHTML', '');
> 
>         if (options.length === 0) {
>@@ -232,7 +232,7 @@
>             this._batches_box.appendChild(batch_item);
> 
>             batch_item.on('click', function (e) {
>-                this.set('selected_batch', i);
>+                this.set(SELECTED_BATCH, i);
>                 this.fire(
>                     SEARCH, this.get(CURRENT_SEARCH_STRING), data.value);
>             }, this);
>@@ -259,7 +259,7 @@
>         var idx = this.get(SELECTED_BATCH);
> 
>         var items = this._batches_box.queryAll('span');
>-        if (items) {
>+        if (items.size()) {
>             this._prev_button.set('disabled', idx === 0);
>             items.removeClass(C_SELECTED_BATCH);
>             items.item(idx).addClass(C_SELECTED_BATCH);
>@@ -415,8 +415,8 @@
>         this._footer_slot_box = Y.Node.create('<div></div');
>         this._footer_slot_box.addClass(C_FOOTER_SLOT);
> 
>-        //We cannot set the bodyContent element here, because
>-        //YUI screwed it up. So fake it.
>+        // We cannot set the bodyContent element here, because
>+        // YUI screwed it up. So fake it.

The "bodyContent element" should probably be referred to
as the "Y.WidgetStdMod.BODY element".

>         var body = Y.Node.create('<div></div>');
>         body.appendChild(search_box);
>         body.appendChild(this._batches_box);
>@@ -445,8 +445,10 @@
> 
>         // Give the focus to the search input.
>         Y.on('focus', function (e) {
>+            if (e.target !== this._search_input){
>             e.halt();
>             this._search_input.focus();
>+            }

Could you indent the inside of this if-statement?

>         }, this.get(BOUNDING_BOX), this);
> 
>         // Focus search box when the widget is first displayed.
>@@ -485,7 +487,14 @@
>         // is changed, and reset the selected one to the first one.
>         this.after('batchesChange', function (e) {
>             this._syncBatchesUI();
>+            if (this.get(SELECTED_BATCH) == 0){
>+                // If the attribute is already set to the same value,
>+                // the 'after' events won't be triggered, so we have
>+                // to trigger it manually.
>+                this._syncSelectedBatchUI();
>+            } else {
>             this.set(SELECTED_BATCH, 0);

Could you indent this line?

>+            }
>         }, this);
> 
>         // Keep the UI in sync with the currently selected batch.
>@@ -686,7 +695,7 @@
>      */
>     selected_batch: {
>         value: 0,
>-        get: function (value) {
>+        getter: function (value) {
>             return value || 0;
>         },
>         validator: function (value) {
>@@ -730,6 +739,6 @@
> 
> }, '0.1', {
>     requires: [
>-        'oop', 'event', 'node', 'substitute', 'lazr.overlay', 'lazr.anim',
>-        'lazr.base']
>+        'oop', 'event', 'event-focus', 'node', 'substitute',
>+        'lazr.overlay', 'lazr.anim', 'lazr.base']
> });
>
>=== modified file 'src-js/lazrjs/testing/testing.js'
>--- src-js/lazrjs/testing/testing.js	2009-10-19 20:25:30 +0000
>+++ src-js/lazrjs/testing/testing.js	2009-10-21 22:29:49 +0000
>@@ -71,7 +71,7 @@
>             fakeTestCase[testObject["methodName"]] = Y.bind(function (testObject) {
>                 var results = [];
> 
>-                var onComplete = function (event, testCaseName, testMethodName, results) {
>+                var onComplete = function (testCaseName, testMethodName, results, event) {

Line too long.

>                     Y.Test.Runner.unsubscribe("testsuitecomplete");
>                     results.push(event.results[testCaseName][testMethodName]);
>                 };
>
>=== modified file 'widgets.conf'
>--- widgets.conf	2009-10-20 13:11:56 +0000
>+++ widgets.conf	2009-10-21 22:29:49 +0000
>@@ -5,37 +5,53 @@

How is this file generated? There appear to be a bunch of diffs
from entries just moving to different spots. If this is generated by
a script, it would be nice to have it sort the list, so that future
diffs show only real changes.

>   - src-js/lazrjs/yui/current/build/widget/assets/skins/sam/widget.css
>   - src-js/lazrjs/yui/current/build/widget/assets/skins/sam/widget-stack.css
>   - src-js/lazrjs/yui/current/build/console/assets/skins/sam/console.css
>+  - src-js/lazrjs/yui/current/build/node-menunav/assets/skins/sam/node-menunav.css
>   - src-js/lazrjs/testing/assets/testlogger.css
>   - src-js/lazrjs/jsUnitMockTimeout.js
>   - src-js/lazrjs/yui/current/build/yui/yui.js
>   - patch src-js/lazrjs/yui-patch.js
>-  - src-js/lazrjs/yui/current/build/attribute/attribute.js
>   - src-js/lazrjs/yui/current/build/oop/oop.js
>   - src-js/lazrjs/yui/current/build/anim/anim.js
>   - src-js/lazrjs/yui/current/build/anim/anim-easing.js
>   - src-js/lazrjs/yui/current/build/substitute/substitute.js
>   - src-js/lazrjs/yui/current/build/classnamemanager/classnamemanager.js
>-  - src-js/lazrjs/yui/current/build/base/base.js
>   - src-js/lazrjs/yui/current/build/dom/dom.js
>   - src-js/lazrjs/yui/current/build/json/json.js
>-  - src-js/lazrjs/yui/current/build/base/base.js
>+  - src-js/lazrjs/yui/current/build/event-custom/event-custom.js
>   - src-js/lazrjs/yui/current/build/event/event.js
>+  - src-js/lazrjs/yui/current/build/event-simulate/event-simulate.js
>+  - src-js/lazrjs/yui/current/build/pluginhost/pluginhost.js
>+  - src-js/lazrjs/yui/current/build/attribute/attribute.js
>+  - src-js/lazrjs/yui/current/build/base/base.js
>+  - src-js/lazrjs/yui/current/build/plugin/plugin.js
>   - src-js/lazrjs/yui/current/build/widget/widget.js
>   - src-js/lazrjs/yui/current/build/widget/widget-position.js
>   - src-js/lazrjs/yui/current/build/widget/widget-stack.js
>   - src-js/lazrjs/yui/current/build/widget/widget-position-ext.js
>   - src-js/lazrjs/yui/current/build/widget/widget-stdmod.js
>   - src-js/lazrjs/yui/current/build/node/node.js
>+  - src-js/lazrjs/yui/current/build/node/node-event-simulate.js
>+  - src-js/lazrjs/yui/current/build/node-focusmanager/node-focusmanager.js
>   - src-js/lazrjs/yui/current/build/node-menunav/node-menunav.js
>   - src-js/lazrjs/yui/current/build/overlay/overlay.js
>   - src-js/lazrjs/yui/current/build/io/io.js
>   - src-js/lazrjs/yui/current/build/io/io-form.js
>   - src-js/lazrjs/yui/current/build/get/get.js
>-  - src-js/lazrjs/yui/current/build/plugin/plugin.js
>+  - src-js/lazrjs/yui/current/build/cache/cache.js
>+  - src-js/lazrjs/yui/current/build/datatype/datatype.js
>+  - src-js/lazrjs/yui/current/build/datatype/datatype-date.js
>+  - src-js/lazrjs/yui/current/build/datatype/datatype-xml.js
>+  - src-js/lazrjs/yui/current/build/dataschema/dataschema-base.js
>+  - src-js/lazrjs/yui/current/build/dataschema/dataschema-array.js
>+  - src-js/lazrjs/yui/current/build/dataschema/dataschema-json.js
>+  - src-js/lazrjs/yui/current/build/dataschema/dataschema-text.js
>+  - src-js/lazrjs/yui/current/build/dataschema/dataschema-xml.js
>+  - src-js/lazrjs/yui/current/build/datasource/datasource.js
>   - src-js/lazrjs/yui/current/build/console/console.js
>-  - src-js/lazrjs/yui/current/build/yuitest/yuitest.js
>   - src-js/lazrjs/yui/current/build/dump/dump.js
>-  - src-js/lazrjs/yui/current/build/queue/queue.js
>+  - src-js/lazrjs/yui/current/build/test/test.js
>+  - src-js/lazrjs/yui/current/build/async-queue/async-queue.js
>+  - src-js/lazrjs/yui/current/build/queue-promote/queue-promote.js
>   - src-js/lazrjs/testing/mockio.js
>   - src-js/lazrjs/testing/testing.js
>   - src-js/lazrjs/activator/activator.js
>@@ -48,7 +64,7 @@
>   - src-js/lazrjs/overlay/overlay.js
>   - src-js/lazrjs/picker/picker.js
>   - src-js/lazrjs/activator/tests/activator.js
>-  - src-js/lazrjs/autocomplete/tests/test.js
>+  - src-js/lazrjs/autocomplete/tests/autocomplete.js
>   - src-js/lazrjs/choiceedit/tests/choiceedit.js
>   - src-js/lazrjs/formoverlay/tests/formoverlay.js
>   - src-js/lazrjs/inlineedit/tests/inline_edit.js
>

review: Needs Fixing (code)

lp:~sidnei/lazr-js/yui-3.0.0-redux updated on 2009-10-22

144. By Sidnei da Silva on 2009-10-22: - Merge from jstestdriver-support
145. By Sidnei da Silva on 2009-10-22: - Sort
146. By Sidnei da Silva on 2009-10-22: - Revert unwanted change to examples.
- Use proper AOP on Picker like on FormOverlay
- Kill some now meaningless comments (after above changes)
- Wrap some long lines
147. By Sidnei da Silva on 2009-10-22: - Fix some long lines

Revision history for this message

Sidnei da Silva (sidnei) wrote on 2009-10-22:

Download full text (17.3 KiB)

>>=== modified file 'examples/inlineeditor/index.html'
>>--- examples/inlineeditor/index.html 2009-10-21 17:35:08.000000000 -0500
>>- // Add the 2 second delay to the underlying editor widget.
>>- multiline_text.editor.plug({fn:DelayedSavePlugin});
>
> Why was this removed?

Uhm, that's something that came from Maris' branch. Since it doesn't
make sense to me either, re-adding it.

>>+ // XXX remove this when done writing the *error CSS stuff.
>>+ // editor.editor.showError("Empty text is unacceptable!");
>>+ // editor.show_editor();
>
> Why were these comments added?

Same as above. Since it doesn't make sense to me, removing it.

>>=== modified file 'widgets.conf'
>>--- widgets.conf 2009-10-20 13:11:56 +0000
>>+++ widgets.conf 2009-10-21 22:29:49 +0000
>>@@ -5,37 +5,53 @@
>
>
> How is this file generated? There appear to be a bunch of diffs
> from entries just moving to different spots. If this is generated by
> a script, it would be nice to have it sort the list, so that future
> diffs show only real changes.

It's manually generated, though it would make sense to have a script
generate it. I will keep that in mind for the future.

In the meantime, I've sorted the file.

As for the long-lines and indentation, all fixed.

I also changed the Picker widget to use the AOP approach like was done
for FormOverlay, and all tests pass. Incremental diff below.

=== modified file 'examples/inlineeditor/index.html'
--- examples/inlineeditor/index.html 2009-09-01 02:14:14 +0000
+++ examples/inlineeditor/index.html 2009-10-22 18:37:47 +0000
@@ -421,9 +421,8 @@
});
multiline_text.render();

- // XXX remove this when done writing the *error CSS stuff.
- // editor.editor.showError("Empty text is unacceptable!");
- // editor.show_editor();
+ // Add the 2 second delay to the underlying editor widget.
+ multiline_text.editor.plug({fn:DelayedSavePlugin});

});
</script>

=== modified file 'src-js/lazrjs/choiceedit/tests/choiceedit.js'
--- src-js/lazrjs/choiceedit/tests/choiceedit.js 2009-10-21 21:43:07 +0000
+++ src-js/lazrjs/choiceedit/tests/choiceedit.js 2009-10-22 18:37:47 +0000
@@ -4,7 +4,8 @@
     base: '../../yui/current/build/',
     filter: 'raw',
     combine: false
- }).use('lazr.choiceedit', 'lazr.testing.runner', 'node', 'event',
'widget-stack', 'console', function(Y) {
+ }).use('lazr.choiceedit', 'lazr.testing.runner', 'node',
+ 'event', 'widget-stack', 'console', function(Y) {

// Local aliases
var Assert = Y.Assert,

=== modified file 'src-js/lazrjs/formoverlay/tests/formoverlay.js'
--- src-js/lazrjs/formoverlay/tests/formoverlay.js 2009-10-21 21:43:07 +0000
+++ src-js/lazrjs/formoverlay/tests/formoverlay.js 2009-10-22 18:37:47 +0000
@@ -75,28 +75,19 @@
cleanup_form_overlay(overlay);
},

>>=== modified file 'examples/inlineeditor/index.html'
>>--- examples/inlineeditor/index.html   2009-10-21 17:35:08.000000000 -0500
>>-    // Add the 2 second delay to the underlying editor widget.
>>-    multiline_text.editor.plug({fn:DelayedSavePlugin});
>
> Why was this removed?

Uhm, that's something that came from Maris' branch. Since it doesn't
make sense to me either, re-adding it.

>>+    // XXX remove this when done writing the *error CSS stuff.
>>+    // editor.editor.showError("Empty text is unacceptable!");
>>+    // editor.show_editor();
>
> Why were these comments added?

Same as above. Since it doesn't make sense to me, removing it.

>>=== modified file 'widgets.conf'
>>--- widgets.conf       2009-10-20 13:11:56 +0000
>>+++ widgets.conf       2009-10-21 22:29:49 +0000
>>@@ -5,37 +5,53 @@
>
>
> How is this file generated? There appear to be a bunch of diffs
> from entries just moving to different spots. If this is generated by
> a script, it would be nice to have it sort the list, so that future
> diffs show only real changes.

It's manually generated, though it would make sense to have a script
generate it. I will keep that in mind for the future.

In the meantime, I've sorted the file.

As for the long-lines and indentation, all fixed.

I also changed the Picker widget to use the AOP approach like was done
for FormOverlay, and all tests pass. Incremental diff below.

=== modified file 'examples/inlineeditor/index.html'
--- examples/inlineeditor/index.html	2009-09-01 02:14:14 +0000
+++ examples/inlineeditor/index.html	2009-10-22 18:37:47 +0000
@@ -421,9 +421,8 @@
     });
     multiline_text.render();

-    // XXX remove this when done writing the *error CSS stuff.
-    // editor.editor.showError("Empty text is unacceptable!");
-    // editor.show_editor();
+    // Add the 2 second delay to the underlying editor widget.
+    multiline_text.editor.plug({fn:DelayedSavePlugin});

});
   </script>

=== modified file 'src-js/lazrjs/choiceedit/tests/choiceedit.js'
--- src-js/lazrjs/choiceedit/tests/choiceedit.js	2009-10-21 21:43:07 +0000
+++ src-js/lazrjs/choiceedit/tests/choiceedit.js	2009-10-22 18:37:47 +0000
@@ -4,7 +4,8 @@
     base: '../../yui/current/build/',
     filter: 'raw',
     combine: false
-    }).use('lazr.choiceedit', 'lazr.testing.runner', 'node', 'event',
'widget-stack', 'console', function(Y) {
+    }).use('lazr.choiceedit', 'lazr.testing.runner', 'node',
+           'event', 'widget-stack', 'console', function(Y) {

// Local aliases
 var Assert = Y.Assert,

=== modified file 'src-js/lazrjs/formoverlay/tests/formoverlay.js'
--- src-js/lazrjs/formoverlay/tests/formoverlay.js	2009-10-21 21:43:07 +0000
+++ src-js/lazrjs/formoverlay/tests/formoverlay.js	2009-10-22 18:37:47 +0000
@@ -75,28 +75,19 @@
         cleanup_form_overlay(overlay);
     },

-    // This fails because YUI adds an extra div for some reason.
-    // If and when this is fixed, and this passes, we'll need to
-    // update test_form_content_in_bodyContent below.
-    // _should: {
-    //     fail: {test_bodyContent_is_single_node: true}
-    // },
-
-    test_bodyContent_is_single_node: function() {
+    test_body_content_is_single_node: function() {
         Assert.areEqual(
             1,
             this.form_overlay.getStdModNode("body").size(),
-            "The bodyContent should be a single node, not a node list.");
+            "The body content should be a single node, not a node list.");
     },

-    test_form_content_in_bodyContent: function() {
+    test_form_content_in_body_content: function() {
         // The form_content should be included in the body of the
         // overlay during initialization.
         var body_content = this.form_overlay.getStdModNode("body");

// Ensure the body_content contains our form node.
-        // Note: see failing test_bodyContent_is_single_node above for why
-        // an index is used here.
         Assert.isTrue(
             body_content.contains(this.form_overlay.form_node),
             "The form node is part of the body content.");
@@ -137,19 +128,16 @@
         this.wait(5000);
     },

-    test_form_submit_in_bodyContent: function() {
-        // The bodyContent should include the submit button.
-
+    test_form_submit_in_body_content: function() {
+        // The body content should include the submit button.
         var body_content = this.form_overlay.getStdModNode("body");
-        // Note: see failing test_bodyContent_is_single_node above for why
-        // an index is used here.
         Assert.isTrue(
             body_content.contains(
                 this.form_overlay.get("form_submit_button")),
-            "The bodyContent includes the form_submit_button.");
+            "The body content includes the form_submit_button.");
     },

-    test_users_submit_button_in_bodyContent: function() {
+    test_users_submit_button_in_body_content: function() {
         // If a user supplies a custom submit button, it should be included
         // in the form instead of the default one.
         var submit_button = Y.Node.create(
@@ -169,19 +157,16 @@
         cleanup_form_overlay(form_overlay);
     },

-    test_form_cancel_in_bodyContent: function() {
-        // The bodyContent should include the cancel button.
-
+    test_form_cancel_in_body_content: function() {
+        // The body content should include the cancel button.
         var body_content = this.form_overlay.getStdModNode("body");
-        // Note: see failing test_bodyContent_is_single_node above for why
-        // an index is used here.
         Assert.isTrue(
             body_content.contains(
                 this.form_overlay.get("form_cancel_button")),
-            "The bodyContent includes the form_cancel_button.");
+            "The body content includes the form_cancel_button.");
     },

-    test_users_cancel_button_in_bodyContent: function() {
+    test_users_cancel_button_in_body_content: function() {
         // If a user supplies a custom cancel button, it should be included
         // in the form instead of the default one.
         var cancel_button = Y.Node.create(
@@ -225,8 +210,6 @@
         this.form_overlay.showError("My special error");

var body_content = this.form_overlay.getStdModNode("body");
-        // Note: see failing test_bodyContent_is_single_node above for why
-        // an index is used here.
         Assert.areNotEqual(
             body_content.get("innerHTML").search("My special error"),
             -1,
@@ -240,8 +223,6 @@
         this.form_overlay.showError("<h2>My special error</h2>");

var body_content = this.form_overlay.getStdModNode("body");
-        // Note: see failing test_bodyContent_is_single_node above for why
-        // an index is used here.
         Assert.areEqual(
             -1,
             body_content.get("innerHTML").search("<h2>"),

=== modified file 'src-js/lazrjs/overlay/tests/overlay.js'
--- src-js/lazrjs/overlay/tests/overlay.js	2009-10-21 21:43:07 +0000
+++ src-js/lazrjs/overlay/tests/overlay.js	2009-10-22 18:37:47 +0000
@@ -4,7 +4,8 @@
     base: '../../yui/current/build/',
     filter: 'raw',
     combine: false
-    }).use('lazr.overlay', 'lazr.testing.runner', 'node', 'event',
'widget-stack', 'console', function(Y) {
+    }).use('lazr.overlay', 'lazr.testing.runner', 'node',
+           'event', 'widget-stack', 'console', function(Y) {

// KeyCode for escape
 var ESCAPE = 27;

=== modified file 'src-js/lazrjs/picker/picker.js'
--- src-js/lazrjs/picker/picker.js	2009-10-21 18:07:07 +0000
+++ src-js/lazrjs/picker/picker.js	2009-10-22 18:37:47 +0000
@@ -54,10 +54,18 @@
     FOOTER_SLOT = 'footer_slot',
     SELECTED_BATCH = 'selected_batch',
     SEARCH_MODE = 'search_mode',
-    NO_RESULTS_SEARCH_MESSAGE = 'no_results_search_message';
+    NO_RESULTS_SEARCH_MESSAGE = 'no_results_search_message',
+    RENDERUI = "renderUI",
+    BINDUI = "bindUI",
+    SYNCUI = "syncUI";
+

var Picker = function () {
     Picker.superclass.constructor.apply(this, arguments);
+
+    Y.after(this._renderUIPicker, this, RENDERUI);
+    Y.after(this._bindUIPicker, this, BINDUI);
+    Y.after(this._syncUIPicker, this, BINDUI);
 };

Y.extend(Picker, Y.lazr.PrettyOverlay, {
@@ -377,12 +385,15 @@

/**
      * Create the widget's HTML components.
+     * <p>
+     * This method is invoked after renderUI is invoked for the Widget class
+     * using YUI's aop infrastructure.
+     * </p>
      *
-     * @method renderUI
+     * @method _renderUIPicker
      * @protected
      */
-    renderUI: function() {
-        Picker.superclass.renderUI.apply(this, arguments);
+    _renderUIPicker: function() {
         this._search_button = Y.Node.create(Y.lazr.ui.SEARCH_BUTTON);

var search_box = Y.Node.create([
@@ -415,26 +426,27 @@
         this._footer_slot_box = Y.Node.create('<div></div');
         this._footer_slot_box.addClass(C_FOOTER_SLOT);

-        // We cannot set the bodyContent element here, because
-        // YUI screwed it up. So fake it.
         var body = Y.Node.create('<div></div>');
         body.appendChild(search_box);
         body.appendChild(this._batches_box);
         body.appendChild(this._results_box);
         body.appendChild(this._footer_slot_box);
         body.addClass('yui-widget-bd');
-        this.get(CONTENT_BOX).appendChild(body);
+
+        this.setStdModContent(Y.WidgetStdMod.BODY, body,
Y.WidgetStdMod.APPEND);
     },

/**
      * Bind the widget's DOM elements to their event handlers.
+     * <p>
+     * This method is invoked after renderUI is invoked for the Widget class
+     * using YUI's aop infrastructure.
+     * </p>
      *
-     * @method bindUI
+     * @method _bindUIPicker
      * @protected
      */
-    bindUI: function() {
-        Picker.superclass.bindUI.apply(this, arguments);
-
+    _bindUIPicker: function() {
         Y.on('click', this._defaultSearchUserAction, this._search_button,
              this);

@@ -521,12 +533,15 @@

/**
      * Synchronize the search box, error message and results with the UI.
+     * <p>
+     * This method is invoked after renderUI is invoked for the Widget class
+     * using YUI's aop infrastructure.
+     * </p>
      *
-     * @method syncUI
+     * @method _syncUIPicker
      * @protected
      */
-    syncUI: function() {
-        Picker.superclass.syncUI.apply(this, arguments);
+    _syncUIPicker: function() {
         this._syncResultsUI();
         this._syncSearchModeUI();
         this._syncBatchesUI();
@@ -737,8 +752,7 @@

Y.Picker = Picker;

-}, '0.1', {
-    requires: [
-        'oop', 'event', 'event-focus', 'node', 'substitute',
-        'lazr.overlay', 'lazr.anim', 'lazr.base']
+}, '0.1', {requires: ['oop', 'event', 'event-focus', 'node',
+                      'substitute', 'widget', 'widget-stdmod',
+                      'lazr.overlay', 'lazr.anim', 'lazr.base']
 });

=== modified file 'src-js/lazrjs/testing/testing.js'
--- src-js/lazrjs/testing/testing.js	2009-10-21 21:43:07 +0000
+++ src-js/lazrjs/testing/testing.js	2009-10-22 18:46:48 +0000
@@ -41,7 +41,8 @@
             // a clone of the original TestCase but with only the
             // single test method that we are interested in.
             for (var prop in testCase){
-                if (prop.indexOf("test") === 0 &&
Y.Lang.isFunction(testCase[prop])){
+                if (prop.indexOf("test") === 0 &&
+                    Y.Lang.isFunction(testCase[prop])){
                     tests.push({"suiteName": suiteName,
                                 "caseName": testCaseName,
                                 "case": clone,
@@ -71,14 +72,15 @@
             fakeTestCase[testObject["methodName"]] = Y.bind(function
(testObject) {
                 var results = [];

-                var onComplete = function (testCaseName,
testMethodName, results, event) {
+                var onComplete = function (caseName, methodName, results, e) {
                     Y.Test.Runner.unsubscribe("testsuitecomplete");
-                    results.push(event.results[testCaseName][testMethodName]);
+                    results.push(e.results[caseName][methodName]);
                 };

Y.Test.Runner.subscribe(
                     "testsuitecomplete",
-                    Y.bind(onComplete, this, testObject["caseName"],
testObject["methodName"], results),
+                    Y.bind(onComplete, this, testObject["caseName"],
+                           testObject["methodName"], results),
                     Y.Test.Runner);

Clock.reset();
@@ -98,7 +100,8 @@

}, this, testObject);

-            TestCase(testObject["caseName"] + "." +
testObject["methodName"], fakeTestCase);
+            TestCase(testObject["caseName"] + "." + testObject["methodName"],
+                     fakeTestCase);
         }
     }
 };

=== modified file 'widgets.conf'
--- widgets.conf	2009-10-22 14:12:59 +0000
+++ widgets.conf	2009-10-22 14:46:35 +0000
@@ -10,48 +10,48 @@
   - src-js/lazrjs/testing/jsUnitMockTimeout.js
   - src-js/lazrjs/yui/current/build/yui/yui.js
   - patch src-js/lazrjs/testing/yui-patch.js
-  - src-js/lazrjs/yui/current/build/oop/oop.js
+  - src-js/lazrjs/yui/current/build/anim/anim-easing.js
   - src-js/lazrjs/yui/current/build/anim/anim.js
-  - src-js/lazrjs/yui/current/build/anim/anim-easing.js
-  - src-js/lazrjs/yui/current/build/substitute/substitute.js
-  - src-js/lazrjs/yui/current/build/classnamemanager/classnamemanager.js
-  - src-js/lazrjs/yui/current/build/dom/dom.js
-  - src-js/lazrjs/yui/current/build/json/json.js
-  - src-js/lazrjs/yui/current/build/event-custom/event-custom.js
-  - src-js/lazrjs/yui/current/build/event/event.js
-  - src-js/lazrjs/yui/current/build/event-simulate/event-simulate.js
-  - src-js/lazrjs/yui/current/build/pluginhost/pluginhost.js
+  - src-js/lazrjs/yui/current/build/async-queue/async-queue.js
   - src-js/lazrjs/yui/current/build/attribute/attribute.js
   - src-js/lazrjs/yui/current/build/base/base.js
-  - src-js/lazrjs/yui/current/build/plugin/plugin.js
-  - src-js/lazrjs/yui/current/build/widget/widget.js
-  - src-js/lazrjs/yui/current/build/widget/widget-position.js
-  - src-js/lazrjs/yui/current/build/widget/widget-stack.js
-  - src-js/lazrjs/yui/current/build/widget/widget-position-ext.js
-  - src-js/lazrjs/yui/current/build/widget/widget-stdmod.js
-  - src-js/lazrjs/yui/current/build/node/node.js
-  - src-js/lazrjs/yui/current/build/node/node-event-simulate.js
-  - src-js/lazrjs/yui/current/build/node-focusmanager/node-focusmanager.js
-  - src-js/lazrjs/yui/current/build/node-menunav/node-menunav.js
-  - src-js/lazrjs/yui/current/build/overlay/overlay.js
-  - src-js/lazrjs/yui/current/build/io/io.js
-  - src-js/lazrjs/yui/current/build/io/io-form.js
-  - src-js/lazrjs/yui/current/build/get/get.js
   - src-js/lazrjs/yui/current/build/cache/cache.js
-  - src-js/lazrjs/yui/current/build/datatype/datatype.js
-  - src-js/lazrjs/yui/current/build/datatype/datatype-date.js
-  - src-js/lazrjs/yui/current/build/datatype/datatype-xml.js
+  - src-js/lazrjs/yui/current/build/classnamemanager/classnamemanager.js
+  - src-js/lazrjs/yui/current/build/console/console.js
+  - src-js/lazrjs/yui/current/build/dataschema/dataschema-array.js
   - src-js/lazrjs/yui/current/build/dataschema/dataschema-base.js
-  - src-js/lazrjs/yui/current/build/dataschema/dataschema-array.js
   - src-js/lazrjs/yui/current/build/dataschema/dataschema-json.js
   - src-js/lazrjs/yui/current/build/dataschema/dataschema-text.js
   - src-js/lazrjs/yui/current/build/dataschema/dataschema-xml.js
   - src-js/lazrjs/yui/current/build/datasource/datasource.js
-  - src-js/lazrjs/yui/current/build/console/console.js
+  - src-js/lazrjs/yui/current/build/datatype/datatype-date.js
+  - src-js/lazrjs/yui/current/build/datatype/datatype-xml.js
+  - src-js/lazrjs/yui/current/build/datatype/datatype.js
+  - src-js/lazrjs/yui/current/build/dom/dom.js
   - src-js/lazrjs/yui/current/build/dump/dump.js
+  - src-js/lazrjs/yui/current/build/event-custom/event-custom.js
+  - src-js/lazrjs/yui/current/build/event-simulate/event-simulate.js
+  - src-js/lazrjs/yui/current/build/event/event.js
+  - src-js/lazrjs/yui/current/build/get/get.js
+  - src-js/lazrjs/yui/current/build/io/io-form.js
+  - src-js/lazrjs/yui/current/build/io/io.js
+  - src-js/lazrjs/yui/current/build/json/json.js
+  - src-js/lazrjs/yui/current/build/node-focusmanager/node-focusmanager.js
+  - src-js/lazrjs/yui/current/build/node-menunav/node-menunav.js
+  - src-js/lazrjs/yui/current/build/node/node-event-simulate.js
+  - src-js/lazrjs/yui/current/build/node/node.js
+  - src-js/lazrjs/yui/current/build/oop/oop.js
+  - src-js/lazrjs/yui/current/build/overlay/overlay.js
+  - src-js/lazrjs/yui/current/build/plugin/plugin.js
+  - src-js/lazrjs/yui/current/build/pluginhost/pluginhost.js
+  - src-js/lazrjs/yui/current/build/queue-promote/queue-promote.js
+  - src-js/lazrjs/yui/current/build/substitute/substitute.js
   - src-js/lazrjs/yui/current/build/test/test.js
-  - src-js/lazrjs/yui/current/build/async-queue/async-queue.js
-  - src-js/lazrjs/yui/current/build/queue-promote/queue-promote.js
+  - src-js/lazrjs/yui/current/build/widget/widget-position-ext.js
+  - src-js/lazrjs/yui/current/build/widget/widget-position.js
+  - src-js/lazrjs/yui/current/build/widget/widget-stack.js
+  - src-js/lazrjs/yui/current/build/widget/widget-stdmod.js
+  - src-js/lazrjs/yui/current/build/widget/widget.js
   - src-js/lazrjs/activator/activator.js
   - src-js/lazrjs/anim/anim.js
   - src-js/lazrjs/autocomplete/autocomplete.js
@@ -70,5 +70,3 @@
   - src-js/lazrjs/inlineedit/tests/inline_edit.js
   - src-js/lazrjs/overlay/tests/overlay.js
   - src-js/lazrjs/picker/tests/picker.js
-
-

lp:~sidnei/lazr-js/yui-3.0.0-redux updated on 2009-10-23

148. By Sidnei da Silva on 2009-10-22: - Fix comments
149. By Sidnei da Silva on 2009-10-22: - Fix some examples, though not all
150. By Sidnei da Silva on 2009-10-23: - Need to unplug the NodeMenuNav before plugging it, otherwise the descendants are all wrong.
151. By Sidnei da Silva on 2009-10-23: - AOP-ize more. Fix a bug with the zIndex of the PrettyOverlay
152. By Sidnei da Silva on 2009-10-23: - Merge from jstestdriver-support
153. By Sidnei da Silva on 2009-10-23: - Remove custom 'show()' method and use a handler on visibleChange instead.
154. By Sidnei da Silva on 2009-10-23: - Fix example

Revision history for this message

Edwin Grubbs (edwin-grubbs) wrote on 2009-10-23:

Hi Sidnei,

Thanks for the fixes, and thanks for the explanations of some of the changes that the new version of YUI brings.

merge-approved

-Edwin

review: Approve (code)

lp:~sidnei/lazr-js/yui-3.0.0-redux updated on 2009-10-30

155. By Sidnei da Silva on 2009-10-30: - Merge from parent branch

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Deryck Hodge

Launchpad code reviewers from Canonical

Martin Albisetti

Sidnei da Silva

 === modified file 'buildout.cfg'
 --- buildout.cfg	2009-10-27 08:59:24 +0000
 +++ buildout.cfg	2009-10-30 17:01:13 +0000
@@ -2,6 +2,7 @@
  develop = .
  parts =
      scripts
++    test
  unzip = true
  eggs-directory = eggs
@@ -27,6 +28,16 @@
  [versions]
  # Alphabetical, case-insensitive, please! :-)
  bzr = 2.0.0
++lazr.testing = 0.1.1
++mocker = 0.10.1
  setuptools = 0.6c9
  zc.buildout = 1.4.1
  zc.recipe.egg = 1.2.2
++zc.recipe.testrunner = 1.2.0
++zope.exceptions = 3.5.2
++zope.interface = 3.5.1
++zope.testing = 3.8.1
++
++[test]
++recipe = zc.recipe.testrunner
++eggs = lazr-js
 === modified file 'examples/activator/index.html'
 --- examples/activator/index.html	2009-04-22 02:42:02 +0000
 +++ examples/activator/index.html	2009-10-30 17:01:13 +0000
@@ -3,7 +3,7 @@
  <html>
  <head>
    <title>Lazr-js examples: Activator</title>
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
    <script type="text/javascript" src="../../build/anim/anim.js"></script>
    <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
    <script type="text/javascript" src="../../build/activator/activator.js"></script>
@@ -11,7 +11,7 @@
  <script id="example-script" type="text/javascript">
  YUI({
--    base: '../../lib/yui/current/build/',
++    base: '../../build/yui/current/build/',
      filter: 'raw'
      }).use('node', 'lazr.activator', function(Y) {
@@ -96,9 +96,9 @@
      We need to include individual css files because some of them have
      relative paths to images.
    -->
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssreset/reset.css" />
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssfonts/fonts.css" />
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssbase/base.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssreset/reset.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssfonts/fonts.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssbase/base.css" />
    <link type="text/css" rel="stylesheet" href="../../build/lazr-sam.css"></link>
    <link type="text/css" rel="stylesheet" href="../../build/lazr/assets/skins/sam/lazr.css"></link>
 === modified file 'examples/anim/index.html'
 --- examples/anim/index.html	2009-03-12 02:55:06 +0000
 +++ examples/anim/index.html	2009-10-30 17:01:13 +0000
@@ -3,14 +3,14 @@
  <html>
  <head>
    <title>Lazr-js examples: anim</title>
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/oop/oop-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/event/event-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/attribute/attribute-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/base/base-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/dom/dom-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/node/node-min.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/anim/anim-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/oop/oop-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/event/event-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/attribute/attribute-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/base/base-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/dom/dom-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/node/node-min.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/anim/anim-min.js"></script>
    <script type="text/javascript" src="../../build/anim/anim.js"></script>
    <script type="text/javascript">
 === modified file 'examples/autocomplete/index.html'
 --- examples/autocomplete/index.html	2009-04-22 19:02:42 +0000
 +++ examples/autocomplete/index.html	2009-10-30 17:01:13 +0000
@@ -4,20 +4,20 @@
  <head>
    <title>Lazr-js examples: autocomplete</title>
--  <link type="text/css" rel="stylesheet" href="../../lib/yui/current/build/cssreset/reset.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/yui/current/build/cssfonts/fonts.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/yui/current/build/cssbase/base.css"></link>
--
--
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/widget/widget-position-debug.js"></script>
--  <script type="text/javascript" src="../../lib/yui/current/build/widget/widget-position-ext-debug.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/lazr.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/autocomplete/autocomplete.js"></script>
++  <link type="text/css" rel="stylesheet" href="../../build/yui/current/build/cssreset/reset.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/yui/current/build/cssfonts/fonts.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/yui/current/build/cssbase/base.css"></link>
++
++
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/widget/widget-position-debug.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/widget/widget-position-ext-debug.js"></script>
++  <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../build/autocomplete/autocomplete.js"></script>
    <script type="text/javascript">
  var LP = YUI({
--    base: '../../lib/yui/current/build/',
++    base: '../../build/yui/current/build/',
      filter: 'raw'
  });
@@ -241,9 +241,9 @@
      We need to include individual css files because some of them have
      relative paths to images.
    -->
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr-sam.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr/assets/skins/sam/lazr.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/autocomplete/assets/skins/sam/autocomplete.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/lazr-sam.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/lazr/assets/skins/sam/lazr.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/autocomplete/assets/skins/sam/autocomplete.css"></link>
    <style type="text/css">
    #example {
 === modified file 'examples/choiceedit/index.html'
 --- examples/choiceedit/index.html	2009-07-30 22:55:42 +0000
 +++ examples/choiceedit/index.html	2009-10-30 17:01:13 +0000
@@ -2,150 +2,27 @@
  <html>
  <head>
    <title>Lazr-js examples: Choice editing</title>
--  <script type="text/javascript" src="../../lib/yui/3.0.0pr2/build/yui/yui.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/lazr.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../build/anim/anim.js"></script>
++  <script type="text/javascript" src="../../build/overlay/overlay.js"></script>
    <!--
      We need to include individual css files because some of them have
      relative paths to images.
    -->
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr-sam.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr/assets/skins/sam/lazr.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/inlineedit/assets/skins/sam/editor.css"></link>
--
--  <script type="text/javascript" src="../../lib/lazr/build/choiceedit/choiceedit.js"></script>
--  <script>
--    YUI({
--    base: '../../lib/yui/3.0.0pr2/build/',
--    filter: 'raw'
--    }).use('node', 'event', 'widget', 'plugin', 'overlay', 'lazr.choiceedit', function(Y) {
--
--    // Add a delay between the start and end of the inline editor widget's
--    // "save" event.
--    var DelayedSavePlugin = function(config) {
--        DelayedSavePlugin.superclass.constructor.apply(this, arguments);
--    };
--
--    DelayedSavePlugin.NAME = 'delayedsave';
--    DelayedSavePlugin.NS = 'fx';
--
--    DelayedSavePlugin.ATTRS = {
--        /*
--         * Default duration of the 'saving' delay, in milliseconds.
--         */
--        duration: {
--            value: 2000
--        }
--    };
--
--    Y.extend(DelayedSavePlugin, Y.Plugin, {
--
--        initializer: function(config) {
--            // Save a reference to the original _saveData() method before
--            // we wrap it up.
--            this.original_save = config.owner._saveData;
--
--            // We want to run our delayed-save code before the original
--            // 'save' method.  Using doBefore() means that unplugging our
--            // code will leave the original widget in a clean state.
--            this.doBefore("_saveData", this._altSave);
--        },
--
--        destructor: function() {},
--
--        /*
--         * Our own _altSave() method, used to override the owner's default
--         * behaviour.  This method will only be called if the editor's input
--         * is valid.
--         */
--        _altSave: function() {
--            var owner = this._owner,
--                delay = this.get('duration');
--
--            Y.log("Running alternative _saveData()", 'info');
--
--            // Set the UI 'waiting' status.
--            owner._uiSetWaiting();
--
--            // Introduce a configurable delay around the owner's _saveData()
--            // method.
--            Y.later(delay, this, function() {
--
--                Y.log("Running original 'save' method.", 'info');
--                this.original_save.apply(owner, arguments[0]);
--
--                // Make sure we clear the 'waiting' status.
--                owner._uiClearWaiting();
--
--            }, arguments);
--
--            // Make sure we prevent the default _devSave() method from
--            // running.
--            return new Y.Do.Halt();
--        }
--    });
--
--
--    var choice_edit = new Y.ChoiceSource({
--        contentBox:  '#status',
--        value:       'incomplete',
--        title:       'Change status to',
--        items: [
--          { name: 'New', value: 'new', style: '',
--            help: '', disabled: false },
--          { name: 'Invalid', value: 'invalid', style: '',
--            help: '', disabled: true },
--          { name: 'Incomplete', value: 'incomplete', style: '',
--            help: '', disabled: false },
--          { name: 'Fix Released', value: 'fixreleased', style: '',
--            help: '', disabled: false },
--          { name: 'Fix Committed', value: 'fixcommitted', style: '',
--            help: '', disabled: true },
--          { name: 'In Progress', value: 'inprogress', style: '',
--            help: '', disabled: false }
--        ]
--    });
--
--    // Add the 2 second delay to the underlying editor widget.
--    choice_edit.plug({fn:DelayedSavePlugin});
--
--    choice_edit.render();
--
--
--    var null_choice_edit = new Y.NullChoiceSource({
--        contentBox:  '#nullchoiceedit',
--        value:       null,
--        title:       'Choose something',
--        items: [
--          { name: 'Chico', value: 'chico', style: '',
--            help: '', disabled: false },
--          { name: 'Harpo', value: 'harpo', style: '',
--            help: '', disabled: false },
--          { name: 'Groucho', value: 'groucho', style: '',
--            help: '', disabled: false },
--          { name: 'Gummo', value: 'gummo', style: '',
--            help: '', disabled: false },
--          { name: 'Zeppo', value: 'zeppo', style: '',
--            help: '', disabled: false },
--          { name: 'Not funny!', value: null, style: '',
--            help: '', disabled: false }
--        ]
--    });
--
--    // Add the 2 second delay to the underlying editor widget.
--    null_choice_edit.plug({fn:DelayedSavePlugin});
--
--    null_choice_edit.render();
--    })
--
--  </script>
--
--  <link type="text/css" rel="stylesheet"
--  href="../../lib/lazr/build/overlay/assets/pretty-overlay-core.css">
--  <link type="text/css" rel="stylesheet"
--  href="../../lib/lazr/build/overlay/assets/skins/sam/pretty-overlay-skin.css">
--  <link type="text/css" rel="stylesheet"
--  href="../../lib/lazr/build/choiceedit/assets/choiceedit-core.css">
++  <link type="text/css" rel="stylesheet" href="../../build/lazr-sam.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/lazr/assets/skins/sam/lazr.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/inlineedit/assets/skins/sam/editor.css"></link>
++
++  <script type="text/javascript" src="../../build/choiceedit/choiceedit.js"></script>
++
++  <link type="text/css" rel="stylesheet"
++  href="../../build/overlay/assets/pretty-overlay-core.css">
++  <link type="text/css" rel="stylesheet"
++  href="../../build/overlay/assets/skins/sam/pretty-overlay-skin.css">
++  <link type="text/css" rel="stylesheet"
++  href="../../build/choiceedit/assets/choiceedit-core.css">
  </head>
  <body class="yui-skin-sam">
@@ -159,15 +36,15 @@
  <h2>Required include dependencies</h2>
  <pre>
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/yui/3.0.0pr2/build/yui/yui.js&quot;&gt;&lt;/script&gt;
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/lazr/build/choiceedit/choiceedit.js&quot;&gt;&lt;/script&gt;
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/lazr/build/anim/anim.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/yui/current/build/yui/yui.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/choiceedit/choiceedit.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/anim/anim.js&quot;&gt;&lt;/script&gt;
    &lt;!-- overlay required files --&gt;
--  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/overlay/assets/pretty-overlay-core.css&quot;&gt;&lt;/link&gt;
--  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/overlay/assets/skins/sam/pretty-overlay-skin.css&quot;&gt;&lt;/link&gt;
++  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../build/overlay/assets/pretty-overlay-core.css&quot;&gt;&lt;/link&gt;
++  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../build/overlay/assets/skins/sam/pretty-overlay-skin.css&quot;&gt;&lt;/link&gt;
    &lt;!-- choiceedit required files --&gt;
--  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/choiceedit/assets/choiceedit-core.css&quot;&gt;&lt;/link&gt;
++  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../build/choiceedit/assets/choiceedit-core.css&quot;&gt;&lt;/link&gt;
  </pre>
@@ -297,5 +174,131 @@
  &lt;/p>
  </pre>
++  <script>
++    YUI({
++    base: '../../build/yui/current/build/',
++    filter: 'raw'
++    }).use('node', 'event', 'widget', 'plugin', 'overlay', 'lazr.choiceedit', function(Y) {
++
++    // Add a delay between the start and end of the inline editor widget's
++    // "save" event.
++    var DelayedSavePlugin = function(config) {
++        DelayedSavePlugin.superclass.constructor.apply(this, arguments);
++    };
++
++    DelayedSavePlugin.NAME = 'delayedsave';
++    DelayedSavePlugin.NS = 'fx';
++
++    DelayedSavePlugin.ATTRS = {
++        /*
++         * Default duration of the 'saving' delay, in milliseconds.
++         */
++        duration: {
++            value: 2000
++        }
++    };
++
++    Y.extend(DelayedSavePlugin, Y.Plugin.Base, {
++
++        initializer: function(config) {
++            // Save a reference to the original _saveData() method before
++            // we wrap it up.
++            this.original_save = config.host._saveData;
++
++            // We want to run our delayed-save code before the original
++            // 'save' method.  Using doBefore() means that unplugging our
++            // code will leave the original widget in a clean state.
++            this.doBefore("_saveData", this._altSave);
++        },
++
++        destructor: function() {},
++
++        /*
++         * Our own _altSave() method, used to override the host's default
++         * behaviour.  This method will only be called if the editor's input
++         * is valid.
++         */
++        _altSave: function() {
++            var host  = this.get('host'),
++                delay = this.get('duration');
++
++            Y.log("Running alternative _saveData()", 'info');
++
++            // Set the UI 'waiting' status.
++            host._uiSetWaiting();
++
++            // Introduce a configurable delay around the host's _saveData()
++            // method.
++            Y.later(delay, this, function() {
++
++                Y.log("Running original 'save' method.", 'info');
++                this.original_save.apply(host, arguments);
++
++                // Make sure we clear the 'waiting' status.
++                host._uiClearWaiting();
++
++            }, arguments);
++
++            // Make sure we prevent the default _devSave() method from
++            // running.
++            return new Y.Do.Halt();
++        }
++    });
++
++
++    var choice_edit = new Y.ChoiceSource({
++        contentBox:  '#status',
++        value:       'incomplete',
++        title:       'Change status to',
++        items: [
++          { name: 'New', value: 'new', style: '',
++            help: '', disabled: false },
++          { name: 'Invalid', value: 'invalid', style: '',
++            help: '', disabled: true },
++          { name: 'Incomplete', value: 'incomplete', style: '',
++            help: '', disabled: false },
++          { name: 'Fix Released', value: 'fixreleased', style: '',
++            help: '', disabled: false },
++          { name: 'Fix Committed', value: 'fixcommitted', style: '',
++            help: '', disabled: true },
++          { name: 'In Progress', value: 'inprogress', style: '',
++            help: '', disabled: false }
++        ]
++    });
++
++    // Add the 2 second delay to the underlying editor widget.
++    choice_edit.plug({fn:DelayedSavePlugin});
++
++    choice_edit.render();
++
++
++    var null_choice_edit = new Y.NullChoiceSource({
++        contentBox:  '#nullchoiceedit',
++        value:       null,
++        title:       'Choose something',
++        items: [
++          { name: 'Chico', value: 'chico', style: '',
++            help: '', disabled: false },
++          { name: 'Harpo', value: 'harpo', style: '',
++            help: '', disabled: false },
++          { name: 'Groucho', value: 'groucho', style: '',
++            help: '', disabled: false },
++          { name: 'Gummo', value: 'gummo', style: '',
++            help: '', disabled: false },
++          { name: 'Zeppo', value: 'zeppo', style: '',
++            help: '', disabled: false },
++          { name: 'Not funny!', value: null, style: '',
++            help: '', disabled: false }
++        ]
++    });
++
++    // Add the 2 second delay to the underlying editor widget.
++    null_choice_edit.plug({fn:DelayedSavePlugin});
++
++    null_choice_edit.render();
++    })
++
++  </script>
++
  </body>
  </html>
 === modified file 'examples/effects/index.html'
 --- examples/effects/index.html	2009-07-21 02:14:12 +0000
 +++ examples/effects/index.html	2009-10-30 17:01:13 +0000
@@ -4,21 +4,21 @@
  <head>
    <title>Lazr-js examples: lazr.effects</title>
--  <link type="text/css" rel="stylesheet" href="../../lib/yui/current/build/cssreset/reset.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/yui/current/build/cssfonts/fonts.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/yui/current/build/cssbase/base.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/yui/current/build/cssreset/reset.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/yui/current/build/cssfonts/fonts.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/yui/current/build/cssbase/base.css"></link>
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/lazr.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/effects/effects.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/lazr.js"></script>
++  <script type="text/javascript" src="../../build/effects/effects.js"></script>
    <!--
      We need to include individual css files because some of them have
      relative paths to images.
    -->
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr-sam.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr/assets/skins/sam/lazr.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/effects/assets/skins/sam/effects.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/lazr-sam.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/lazr/assets/skins/sam/lazr.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/effects/assets/skins/sam/effects.css"></link>
    <style type="text/css">
    .example {
@@ -192,7 +192,7 @@
  <script type="text/javascript">
  YUI({
--        base: '../../lib/yui/current/build/',
++        base: '../../build/yui/current/build/',
          filter: 'raw'
      }).use('node', 'event', 'lazr.effects', function(Y) {
 === modified file 'examples/formoverlay/index.html'
 --- examples/formoverlay/index.html	2009-05-15 07:38:48 +0000
 +++ examples/formoverlay/index.html	2009-10-30 17:01:13 +0000
@@ -5,21 +5,22 @@
    <title>LAZR JS Examples: lazr.formoverlay</title>
    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
--  <script type="text/javascript" src="../../lib/yui/3.0.0pr2/build/yui/yui.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/overlay/overlay.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/formoverlay/formoverlay.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../build/overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../build/formoverlay/formoverlay.js"></script>
--  <link rel="stylesheet" href="../../lib/yui/3.0.0pr2/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../lib/yui/3.0.0pr2/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../lib/yui/3.0.0pr2/build/cssbase/base.css"/>
--  <link rel="stylesheet" href="../../lib/lazr/build/overlay/assets/pretty-overlay-core.css"/>
--  <link rel="stylesheet" href="../../lib/lazr/build/overlay/assets/skins/sam/pretty-overlay-skin.css"/>
--  <link rel="stylesheet" href="../../lib/lazr/build/formoverlay/assets/formoverlay.css"/>
++  <link rel="stylesheet" href="../../build/yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../build/yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../build/yui/current/build/cssbase/base.css"/>
++  <link rel="stylesheet" href="../../build/overlay/assets/pretty-overlay-core.css"/>
++  <link rel="stylesheet" href="../../build/overlay/assets/skins/sam/pretty-overlay-skin.css"/>
++  <link rel="stylesheet" href="../../build/formoverlay/assets/formoverlay.css"/>
    <script type="text/javascript">
  YUI({
--    base: "../../lib/yui/3.0.0pr2/build/",
++    base: "../../build/yui/current/build/",
      filter: 'raw',
  }).use('lazr.formoverlay', 'node', 'event', 'dump', function(Y) {
@@ -93,7 +94,9 @@
      });
      formoverlay.render();
--    Y.on("domready", function(){ formoverlay.show()});
++    Y.on("domready", function(){
++        formoverlay.show();
++    });
      Y.on('click', function(e) {
          Y.log("Showing overlay", "info");
@@ -123,16 +126,16 @@
    <h3>Javascript</h3>
    <pre>
--    &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/yui/3.0.0pr2/build/yui/yui.js&quot;&gt;&lt;/script&gt;
--    &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/lazr/build/overlay/overlay.js&quot;&gt;&lt;/script&gt;
--    &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/lazr/build/formoverlay/formoverlay.js&quot;&gt;&lt;/script&gt;
++    &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/yui/current/build/yui/yui.js&quot;&gt;&lt;/script&gt;
++    &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/overlay/overlay.js&quot;&gt;&lt;/script&gt;
++    &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/formoverlay/formoverlay.js&quot;&gt;&lt;/script&gt;
    </pre>
    <h3>CSS</h3>
    <pre>
--    &lt;link rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/overlay/assets/pretty-overlay-core.css&quot; /&gt;
--    &lt;link rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/overlay/assets/skins/sam/pretty-overlay-skin.css&quot; /&gt;
--    &lt;link rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/formoverlay/assets/formoverlay.css&quot; /&gt;
++    &lt;link rel=&quot;stylesheet&quot; href=&quot;../../build/overlay/assets/pretty-overlay-core.css&quot; /&gt;
++    &lt;link rel=&quot;stylesheet&quot; href=&quot;../../build/overlay/assets/skins/sam/pretty-overlay-skin.css&quot; /&gt;
++    &lt;link rel=&quot;stylesheet&quot; href=&quot;../../build/formoverlay/assets/formoverlay.css&quot; /&gt;
    </pre>
    <h2>Widget Setup</h2>
 === modified file 'examples/inlineeditor/index.html'
 --- examples/inlineeditor/index.html	2009-10-22 02:04:44 +0000
 +++ examples/inlineeditor/index.html	2009-10-30 17:01:13 +0000
@@ -3,117 +3,19 @@
  <html>
  <head>
    <title>Lazr-js examples: In-line text editing</title>
--  <script type="text/javascript" src="../../lib/yui/3.0.0pr2/build/yui/yui.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/lazr.js"></script>
--  <script type="text/javascript" src="../../lib/lazr/build/inlineedit/editor.js"></script>
--  <script type="text/javascript">
--
--YUI({
--    base: '../../lib/yui/3.0.0pr2/build/',
--    filter: 'raw'
--    }).use('node', 'event', 'plugin', 'lazr.editor', function(Y) {
--
--    // Add a delay between the start and end of the inline editor widget's
--    // "save" event.
--    var DelayedSavePlugin = function(config) {
--        DelayedSavePlugin.superclass.constructor.apply(this, arguments);
--    };
--
--    DelayedSavePlugin.NAME = 'delayedsave';
--    DelayedSavePlugin.NS = 'fx';
--
--    DelayedSavePlugin.ATTRS = {
--        /*
--         * Default duration of the 'saving' delay, in milliseconds.
--         */
--        duration: {
--            value: 2000
--        }
--    };
--
--    Y.extend(DelayedSavePlugin, Y.Plugin, {
--
--        initializer: function(config) {
--            // Save a reference to the original _saveData() method before
--            // we wrap it up.
--            this.original_save = config.owner._saveData;
--
--            // We want to run our delayed-save code before the original
--            // 'save' method.  Using doBefore() means that unplugging our
--            // code will leave the original widget in a clean state.
--            this.doBefore("_saveData", this._altSave);
--        },
--
--        destructor: function() {},
--
--        /*
--         * Our own _altSave() method, used to override the owner's default
--         * behaviour.  This method will only be called if the editor's input
--         * is valid.
--         */
--        _altSave: function() {
--            var owner = this._owner,
--                delay = this.get('duration');
--
--            Y.log("Running alternative _saveData()", 'info');
--
--            // Set the UI 'waiting' status.
--            owner._uiSetWaiting();
--
--            // Introduce a configurable delay around the owner's _saveData()
--            // method.
--            Y.later(delay, this, function() {
--
--                Y.log("Running original 'save' method.", 'info');
--                this.original_save.apply(owner, arguments[0]);
--
--                // Make sure we clear the 'waiting' status.
--                owner._uiClearWaiting();
--
--            }, arguments);
--
--            // Make sure we prevent the default _devSave() method from
--            // running.
--            return new Y.Do.Halt();
--        }
--    });
--
--    var editable_text = new Y.EditableText({
--        contentBox:  '#editable_text'
--    });
--
--    editable_text.render();
--
--    // Add the 2 second delay to the underlying editor widget.
--    editable_text.editor.plug({fn:DelayedSavePlugin});
--
--    // Hook up the "allow empty" button.
--    Y.on('click', function(ev) {
--        var accept_empty = !editor.get('accept_empty');
--        Y.log("Allowing empty editor input: " + accept_empty, 'info');
--        editor.set('accept_empty', accept_empty);
--    }, 'input[name=accept_empty]');
--
--    var multiline_text = new Y.EditableText({
--        contentBox: '#edit-test-description',
--        multiline: true,
--        buttons: 'top'
--    });
--    multiline_text.render();
--
--    // Add the 2 second delay to the underlying editor widget.
--    multiline_text.editor.plug({fn:DelayedSavePlugin});
--});
--  </script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../build/anim/anim.js"></script>
++  <script type="text/javascript" src="../../build/inlineedit/editor.js"></script>
    <!--
      We need to include individual css files because some of them have
      relative paths to images.
    -->
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr-sam.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/lazr/assets/skins/sam/lazr.css"></link>
--  <link type="text/css" rel="stylesheet" href="../../lib/lazr/build/inlineedit/assets/skins/sam/editor.css"></link>
--  <link rel="stylesheet" type="text/css" href="../../src/inlineedit/assets/skins/sam/editor-skin.css" />
++  <link type="text/css" rel="stylesheet" href="../../build/lazr-sam.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/lazr/assets/skins/sam/lazr.css"></link>
++  <link type="text/css" rel="stylesheet" href="../../build/inlineedit/assets/skins/sam/editor.css"></link>
++  <link rel="stylesheet" type="text/css" href="../../build/inlineedit/assets/skins/sam/editor-skin.css" />
    <style>
    #example {
        margin-left: 20px;
@@ -163,11 +65,11 @@
  <p><strong>Don't forget to include the widget's CSS files!</strong></p>
  <pre>
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/yui/3.0.0pr2/build/yui/yui.js&quot;&gt;&lt;/script&gt;
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/lazr/build/inlineedit/editor.js&quot;&gt;&lt;/script&gt;
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/lazr/build/anim/anim.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/yui/3.0.0pr2/build/yui/yui.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/inlineedit/editor.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/anim/anim.js&quot;&gt;&lt;/script&gt;
--  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../lib/lazr/build/inlineedit/assets/skins/sam/editor.css&quot;&gt;&lt;/link&gt;
++  &lt;link type=&quot;text/css&quot; rel=&quot;stylesheet&quot; href=&quot;../../build/inlineedit/assets/skins/sam/editor.css&quot;&gt;&lt;/link&gt;
  </pre>
  <pre>
@@ -425,5 +327,106 @@
    </li>
  </ul>
++  <script type="text/javascript">
++
++YUI({
++    base: '../../build/yui/current/build/',
++    filter: 'raw'
++    }).use('node', 'event', 'plugin', 'lazr.editor', function(Y) {
++
++    // Add a delay between the start and end of the inline editor widget's
++    // "save" event.
++    var DelayedSavePlugin = function(config) {
++        DelayedSavePlugin.superclass.constructor.apply(this, arguments);
++    };
++
++    DelayedSavePlugin.NAME = 'delayedsave';
++    DelayedSavePlugin.NS = 'fx';
++
++    DelayedSavePlugin.ATTRS = {
++        /*
++         * Default duration of the 'saving' delay, in milliseconds.
++         */
++        duration: {
++            value: 2000
++        }
++    };
++
++    Y.extend(DelayedSavePlugin, Y.Plugin.Base, {
++
++        initializer: function(config) {
++            // Save a reference to the original _saveData() method before
++            // we wrap it up.
++            this.original_save = config.host._saveData;
++
++            // We want to run our delayed-save code before the original
++            // 'save' method.  Using doBefore() means that unplugging our
++            // code will leave the original widget in a clean state.
++            this.doBefore("_saveData", this._altSave);
++        },
++
++        destructor: function() {},
++
++        /*
++         * Our own _altSave() method, used to override the host's default
++         * behaviour.  This method will only be called if the editor's input
++         * is valid.
++         */
++        _altSave: function() {
++            var host  = this.get('host'),
++                delay = this.get('duration');
++
++            Y.log("Running alternative _saveData()", 'info');
++
++            // Set the UI 'waiting' status.
++            host._uiSetWaiting();
++
++            // Introduce a configurable delay around the host's _saveData()
++            // method.
++            Y.later(delay, this, function() {
++
++                Y.log("Running original 'save' method.", 'info');
++                this.original_save.apply(host, arguments);
++
++                // Make sure we clear the 'waiting' status.
++                host._uiClearWaiting();
++
++            }, arguments);
++
++            // Make sure we prevent the default _devSave() method from
++            // running.
++            return new Y.Do.Halt();
++        }
++    });
++
++    var editable_text = new Y.EditableText({
++        contentBox:  '#editable_text'
++    });
++
++    editable_text.render();
++
++    // Add the 2 second delay to the underlying editor widget.
++    editable_text.editor.plug({fn:DelayedSavePlugin});
++
++    // Hook up the "allow empty" button.
++    Y.on('click', function(ev) {
++        var accept_empty = !editable_text.get('accept_empty');
++        Y.log("Allowing empty editor input: " + accept_empty, 'info');
++        editable_text.set('accept_empty', accept_empty);
++    }, 'input[name=accept_empty]');
++
++    var multiline_text = new Y.EditableText({
++        contentBox: '#edit-test-description',
++        multiline: true,
++        buttons: 'top',
++    });
++    multiline_text.render();
++
++    // Add the 2 second delay to the underlying editor widget.
++    multiline_text.editor.plug({fn:DelayedSavePlugin});
++
++});
++  </script>
++
  </body>
  </html>
 === modified file 'examples/lazr/index.html'
 --- examples/lazr/index.html	2009-03-05 01:50:43 +0000
 +++ examples/lazr/index.html	2009-10-30 17:01:13 +0000
@@ -5,13 +5,13 @@
    <title>LAZR JS Examples: lazr.base</title>
    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
    <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
    <script type="text/javascript">
  YUI({
--    base: "../../lib/yui/current/build/",
++    base: "../../build/yui/current/build/",
      filter: 'raw',
  }).use('node', 'lazr.base', function(Y) {
@@ -72,7 +72,7 @@
  <p>The common usage:</p>
  <pre>
--  &lt;script type=&quot;text/javascript&quot; src=&quot;../../lib/yui/current/build/yui/yui.js&quot;&gt;&lt;/script&gt;
++  &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/yui/current/build/yui/yui.js&quot;&gt;&lt;/script&gt;
    &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/lazr/lazr.js&quot;&gt;&lt;/script&gt;
    &lt;script type=&quot;text/javascript&quot; src=&quot;../../build/lazr/assets/skins/sam/lazr-skin.css&quot;&gt;&lt;/script&gt;
  </pre>
 === modified file 'examples/overlay/index.html'
 --- examples/overlay/index.html	2009-02-21 18:21:14 +0000
 +++ examples/overlay/index.html	2009-10-30 17:01:13 +0000
@@ -5,12 +5,12 @@
    <title>LAZR JS Examples: lazr.overlay</title>
    <meta http-equiv="content-type" content="text/html;charset=utf-8" />
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
    <script type="text/javascript" src="../../build/overlay/overlay.js"></script>
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssreset/reset.css" />
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssfonts/fonts.css" />
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssbase/base.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssreset/reset.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssfonts/fonts.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssbase/base.css" />
    <link rel="stylesheet" type="text/css" href="../../build/overlay/assets/pretty-overlay-core.css" />
    <link rel="stylesheet" type="text/css" href="../../build/overlay/assets/skins/sam/pretty-overlay-skin.css" />
@@ -109,7 +109,7 @@
  <script type="text/javascript">
  YUI({
--    base: '../../lib/yui/current/build/',
++    base: '../../build/yui/current/build/',
      filter: "raw",
      combine: false
  }).use('lazr.overlay', function(Y) {
 === modified file 'examples/picker/index.html'
 --- examples/picker/index.html	2009-05-07 16:27:01 +0000
 +++ examples/picker/index.html	2009-10-30 17:01:13 +0000
@@ -3,7 +3,7 @@
  <html>
  <head>
    <title>Lazr-js examples: Picker widget</title>
--  <script type="text/javascript" src="../../lib/yui/current/build/yui/yui.js"></script>
++  <script type="text/javascript" src="../../build/yui/current/build/yui/yui.js"></script>
    <script type="text/javascript" src="../../build/anim/anim.js"></script>
    <script type="text/javascript" src="../../build/lazr/lazr.js"></script>
    <script type="text/javascript" src="../../build/overlay/overlay.js"></script>
@@ -12,7 +12,7 @@
    <script type="text/javascript">
  YUI({
--    base: '../../lib/yui/current/build/',
++    base: '../../build/yui/current/build/',
      filter: 'raw'
      }).use('lazr.picker', 'dump', function(Y) {
           // Parse the content of the textarea in the data structure
@@ -160,9 +160,9 @@
  });
    </script>
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssreset/reset.css" />
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssfonts/fonts.css" />
--  <link rel="stylesheet" type="text/css" href="../../lib/yui/current/build/cssbase/base.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssreset/reset.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssfonts/fonts.css" />
++  <link rel="stylesheet" type="text/css" href="../../build/yui/current/build/cssbase/base.css" />
    <link rel="stylesheet" type="text/css" href="../../build/overlay/assets/skins/sam/pretty-overlay.css" />
    <link type="text/css" rel="stylesheet" href="../../build/lazr/assets/skins/sam/lazr.css" />
 === modified file 'setup.py'
 --- setup.py	2009-10-28 19:04:25 +0000
 +++ setup.py	2009-10-30 17:01:13 +0000
@@ -26,6 +26,7 @@
      license='GPL v3',
      install_requires=[
          'bzr',
++        'lazr.testing',
          'setuptools',
      ],
      url='https://launchpad.net/lazr-js',
 === modified file 'src-js/lazrjs/activator/tests/activator.html'
 --- src-js/lazrjs/activator/tests/activator.html	2009-03-13 15:54:02 +0000
 +++ src-js/lazrjs/activator/tests/activator.html	2009-10-30 17:01:13 +0000
@@ -5,30 +5,24 @@
    <title>Activator</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/current/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssbase/base.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
    <!-- The module under test -->
--  <script type="text/javascript" src="../../../build/activator/activator.js"></script>
--  <script type="text/javascript" src="../../../build/anim/anim.js"></script>
--  <script type="text/javascript" src="../../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../activator/activator.js"></script>
++  <script type="text/javascript" src="../../anim/anim.js"></script>
++  <script type="text/javascript" src="../../lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
    <!-- The test suite -->
    <script type="text/javascript" src="activator.js"></script>
--  <link rel="stylesheet" href="../../../src/testing/assets/testlogger.css"/>
++  <link rel="stylesheet" href="../../testing/assets/testlogger.css"/>
  </head>
  <body class="yui-skin-sam">
--<div id="workspace"
--     style="border: 1px solid blue;
--            width: 20em;
--            margin: 1em;
--            padding: 1em">
--</div>
--
  <div id="log"></div>
  </body>
  </html>
 === modified file 'src-js/lazrjs/activator/tests/activator.js'
 --- src-js/lazrjs/activator/tests/activator.js	2009-04-22 02:42:02 +0000
 +++ src-js/lazrjs/activator/tests/activator.js	2009-10-30 17:01:13 +0000
@@ -1,10 +1,11 @@
  /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/current/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.activator', 'node', 'event', 'yuitest', 'console', function(Y) {
++    }).use('lazr.activator', 'lazr.testing.runner', 'node',
++           'event', 'event-simulate', 'console', function(Y) {
  var Assert = Y.Assert;  // For easy access to isTrue(), etc.
@@ -37,6 +38,16 @@
      setUp: function() {
          this.workspace = Y.get('#workspace');
++        if (!this.workspace){
++            Y.get(document.body).appendChild(Y.Node.create(
++                '<div id="workspace" ' +
++                'style="border: 1px solid blue; ' +
++                'width: 20em; ' +
++                'margin: 1em; ' +
++                'padding: 1em">'+
++                '</div>'));
++            this.workspace = Y.get('#workspace');
++        }
          this.workspace.appendChild(Y.Node.create(
              '<div id="example-1">' +
              '<span class="yui-activator-data-box">' +
@@ -233,15 +244,7 @@
+     }
  }));
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/autocomplete/autocomplete.js'
 --- src-js/lazrjs/autocomplete/autocomplete.js	2009-07-16 19:35:57 +0000
 +++ src-js/lazrjs/autocomplete/autocomplete.js	2009-10-30 17:01:14 +0000
@@ -1,19 +1,4 @@
--/*
--    Copyright (c) 2009, Canonical Ltd.  All rights reserved.
--
--    This program is free software: you can redistribute it and/or modify
--    it under the terms of the GNU Affero General Public License as published by
--    the Free Software Foundation, either version 3 of the License, or
--    (at your option) any later version.
--
--    This program is distributed in the hope that it will be useful,
--    but WITHOUT ANY WARRANTY; without even the implied warranty of
--    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--    GNU Affero General Public License for more details.
--
--    You should have received a copy of the GNU Affero General Public License
--    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--*/
++/* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
  YUI.add('lazr.autocomplete', function(Y) {
@@ -51,7 +36,7 @@
  // We need a base class on which to build our autocomplete widget, so we will
  // make that class capable of positioning itself, too.
--var AutoCompleteBase = Y.Base.build(Y.Widget, [Y.WidgetStack]);
++var AutoCompleteBase = Y.Base.build("AutoCompleteBase", Y.Widget, [Y.WidgetStack]);
  /**
@@ -119,7 +104,7 @@
       */
      input: {
          value: null,
--        set: function(val) {
++        setter: function(val) {
              return this._setInput(val);
+         }
      },
@@ -254,6 +239,8 @@
          var cbox = this.get(CONTENT_BOX);
++        this.get(BOUNDING_BOX).unplug(Y.Plugin.NodeMenuNav);
++
          if (this._completions) {
              cbox.replaceChild(list, this._completions);
          } else {
@@ -261,7 +248,7 @@
+         }
          // Re-plug the MenuNav, so it updates the menu options.
--        this.get(BOUNDING_BOX).plug(Y.plugin.NodeMenuNav);
++        this.get(BOUNDING_BOX).plug(Y.Plugin.NodeMenuNav);
          // Highlight the first item.
          this._selectItem(0, false);
@@ -601,7 +588,7 @@
          // It is ugly to have to check protected members of the menu
          // like this, but the 'currently selected item' should
          // really be public, don't you think?
--        var menu = this.get(BOUNDING_BOX).MenuNav;
++        var menu = this.get(BOUNDING_BOX).menuNav;
          if (menu) {
              return menu._activeItem ? menu._activeItem : null;
+         }
@@ -620,11 +607,12 @@
       * be found.
       */
      _selectItem: function(index, set_focus) {
--        var menu = this.get(BOUNDING_BOX).MenuNav;
++        var menu = this.get(BOUNDING_BOX).menuNav;
          // More ugliness, looking at protected object members that should
          // be made public.
--        var item = menu ? menu._firstItem : null;
++        var firstItem = menu._rootMenu.all('.yui-menuitem').item(0)
++        var item = menu ? firstItem : null;
          if (!menu || !item) {
              return null;
+         }
@@ -636,11 +624,14 @@
+             }
+         }
--        menu._setActiveItem(item);
          if (set_focus) {
              // We need an anchor to focus on, because some browsers (IE, ahem)
              // don't like focusing non-anchor things.
              var anchor = item.query('a');
++
++            menu._focusManager.set("activeDescendant", anchor);
++            menu._focusItem(item);
++
              if (anchor) {
                  // Use a 5ms timer to give the browser rendering engine some
                  // time to catch up to the JS call, and prevent a race
@@ -648,6 +639,7 @@
                  Y.later(5, anchor, anchor.focus);
+             }
+         }
++        menu._setActiveItem(item);
          return item;
      },
@@ -722,7 +714,7 @@
      },
      /**
--     * Handle presses of keys like Tab ane Enter
++     * Handle presses of keys like Tab and Enter
+      *
       * @method _onInputKeydown
       * @protected
@@ -797,11 +789,4 @@
  };
--}, null, {
--    requires:[
--        'oop',
--        'base',
--        'widget',
--        'widget-stack',
--        'node-menunav'
--]});
++}, '0.1', {requires:['oop', 'base', 'event', 'widget', 'widget-stack', 'node-menunav']});
 === renamed file 'src-js/lazrjs/autocomplete/tests/test.js' => 'src-js/lazrjs/autocomplete/tests/autocomplete.js'
 --- src-js/lazrjs/autocomplete/tests/test.js	2009-03-27 04:38:14 +0000
 +++ src-js/lazrjs/autocomplete/tests/autocomplete.js	2009-10-30 17:01:14 +0000
@@ -1,33 +1,17 @@
--/*
--    Copyright (c) 2009, Canonical Ltd.  All rights reserved.
--
--    This program is free software: you can redistribute it and/or modify
--    it under the terms of the GNU Affero General Public License as published by
--    the Free Software Foundation, either version 3 of the License, or
--    (at your option) any later version.
--
--    This program is distributed in the hope that it will be useful,
--    but WITHOUT ANY WARRANTY; without even the implied warranty of
--    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--    GNU Affero General Public License for more details.
--
--    You should have received a copy of the GNU Affero General Public License
--    along with this program.  If not, see <http://www.gnu.org/licenses/>.
--*/
++/* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/current/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.autocomplete', 'node', 'event', 'yuitest', 'console', function(Y) {
--
++    }).use('lazr.autocomplete', 'lazr.testing.runner',
++           'node', 'event', 'console', function(Y) {
  /*****************************
+  *
   *  Helper methods and aliases
+  *
   */
--
  var Assert = Y.Assert;
  /* Helper function to clean up a dynamically added widget instance. */
@@ -584,16 +568,7 @@
+     }
  }));
--
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/autocomplete/tests/index.html'
 --- src-js/lazrjs/autocomplete/tests/index.html	2009-03-18 00:42:42 +0000
 +++ src-js/lazrjs/autocomplete/tests/index.html	2009-10-30 17:01:14 +0000
@@ -5,18 +5,19 @@
    <title>autocomplete unit tests</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/current/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssbase/base.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
--  <link rel="stylesheet" href="../../../src/testing/assets/testlogger.css"/>
++  <link rel="stylesheet" href="../../testing/assets/testlogger.css"/>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
    <!-- The module under test -->
    <script type="text/javascript" src="../autocomplete.js"></script>
    <!-- The test suite -->
--  <script type="text/javascript" src="test.js"></script>
++  <script type="text/javascript" src="autocomplete.js"></script>
  </head>
  <body class="yui-skin-sam">
 === modified file 'src-js/lazrjs/choiceedit/choiceedit.js'
 --- src-js/lazrjs/choiceedit/choiceedit.js	2009-08-21 14:06:19 +0000
 +++ src-js/lazrjs/choiceedit/choiceedit.js	2009-10-30 17:01:14 +0000
@@ -20,6 +20,9 @@
      C_ADDICON          = 'addicon',
      SAVE               = 'save',
      LEFT_MOUSE_BUTTON  = 1,
++    RENDERUI           = "renderUI",
++    BINDUI             = "bindUI",
++    SYNCUI             = "syncUI",
      NOTHING            = new Object();
  /**
@@ -33,6 +36,8 @@
  var ChoiceSource = function() {
      ChoiceSource.superclass.constructor.apply(this, arguments);
++    Y.after(this._bindUIChoiceSource, this, BINDUI);
++    Y.after(this._syncUIChoiceSource, this, SYNCUI);
  };
  ChoiceSource.NAME = CHOICESOURCE;
@@ -94,7 +99,7 @@
       */
      value_location: {
        value: null,
--      set: function(v) {
++      setter: function(v) {
          return Y.get(v);
+       }
      },
@@ -110,7 +115,7 @@
       */
      editicon: {
        value: null,
--      set: function(v) {
++      setter: function(v) {
          return Y.get(v);
+       }
      },
@@ -123,14 +128,14 @@
       * @type Node
       */
      actionicon: {
--      get: function() {
++      getter: function() {
          return this.get('editicon');
+       }
      },
      elementToFlash: {
        value: null,
--      set: function(v) {
++      setter: function(v) {
          return Y.get(v);
+       }
      },
@@ -138,7 +143,7 @@
      backgroundColor: {
        value: null
      },
--
++
      clickable_content: {
        value: true
+     }
@@ -160,10 +165,15 @@
      /**
       * bind UI events
++     * <p>
++     * This method is invoked after bindUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method bindUI
++     * @method _bindUIChoiceSource
++     * @protected
       */
--     bindUI: function() {
++    _bindUIChoiceSource: function() {
          var that = this;
          if (this.get('clickable_content')) {
              var clickable_element = this.get('contentBox');
@@ -188,10 +198,15 @@
      /**
       * Update in-page HTML with current value of the field
++     * <p>
++     * This method is invoked after syncUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method syncUI
++     * @method _syncUIChoiceSource
++     * @protected
       */
--    syncUI: function() {
++    _syncUIChoiceSource: function() {
          var items = this.get("items");
          var value = this.get("value");
          var node = this.get("value_location");
@@ -411,14 +426,21 @@
           */
          this.publish("valueChosen");
          this.after("renderedChange", this._positionCorrectly);
++        Y.after(this._renderUIChoiceList, this, RENDERUI);
++        Y.after(this._bindUIChoiceList, this, BINDUI);
      },
      /**
       * Render the popup menu
++     * <p>
++     * This method is invoked after renderUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method renderUI
++     * @method _renderUIChoiceList
++     * @protected
       */
--    renderUI: function() {
++    _renderUIChoiceList: function() {
          this.set("align", {
            node: this.get("value_location"),
            points:[Y.WidgetPositionExt.TL, Y.WidgetPositionExt.TL]
@@ -448,26 +470,26 @@
+             }
              display_items_list.appendChild(li);
+         }
--        this.set("bodyContent", display_items_list);
++
++        this.setStdModContent(Y.WidgetStdMod.BODY, display_items_list, Y.WidgetStdMod.REPLACE);
          this.move(-10000, 0);
      },
      /**
       * Bind UI events
++     * <p>
++     * This method is invoked after bindUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method bindUI
++     * @method _bindUIChoiceList
++     * @protected
       */
--    bindUI: function() {
--        // We need to call the superclass's bindUI because it does things.
--        ChoiceList.superclass.bindUI.apply(this);
--
++    _bindUIChoiceList: function() {
          var display_items_list = this.get("display_items_list");
          var that = this;
--        display_items_list.on("click", function(e) {
--            var target = e.target;
--            while (target.get("nodeName").toLowerCase() != "a") {
--                target = target.get("parentNode");
--            }
++        Y.delegate("click", function(e) {
++            var target = e.currentTarget;
              var value = target._value;
              var items = that.get("items");
              for (var i=0; i<items.length; i++) {
@@ -478,7 +500,7 @@
                      break;
+                 }
+             }
--        });
++        }, display_items_list, "li a");
      },
      /**
@@ -581,7 +603,7 @@
       * @attribute actionicon
       */
      actionicon: {
--        get: function() {
++        getter: function() {
              if (Y.Lang.isValue(this.get('value'))) {
                  return this.get('editicon');
              } else {
@@ -598,7 +620,7 @@
       */
      items: {
          value: [],
--        get: function(v) {
++        getter: function(v) {
              if (!Y.Lang.isValue(this.get("value"))) {
                  v = Y.Array(v).filter(function(item) {
                      return (Y.Lang.isValue(item.value));
@@ -619,7 +641,7 @@
+             }
              return v;
          },
--        clone : Y.Attribute.CLONE.DEEP
++        clone : "deep"
+     }
+ }
@@ -647,6 +669,7 @@
  Y.NullChoiceSource = NullChoiceSource;
--},'0.2', {requires:
--    ['oop', 'event', 'node', 'widget', 'overlay', 'lazr.overlay', 'lazr.anim', 'lazr.base']});
++},'0.2', {requires: ['oop', 'event', 'event-delegate', 'node',
++                     'widget', 'widget-stdmod', 'overlay',
++                     'lazr.overlay', 'lazr.anim', 'lazr.base']});
 === modified file 'src-js/lazrjs/choiceedit/tests/choiceedit.html'
 --- src-js/lazrjs/choiceedit/tests/choiceedit.html	2009-02-20 14:15:34 +0000
 +++ src-js/lazrjs/choiceedit/tests/choiceedit.html	2009-10-30 17:01:14 +0000
@@ -4,17 +4,19 @@
    <title>Status Editor</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/3.0.0pr2/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/3.0.0pr2/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/3.0.0pr2/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/3.0.0pr2/build/cssbase/base.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
    <!-- Dependency -->
--  <script type="text/javascript" src="../../../lib/lazr/build/lazr.js"></script>
--  <script type="text/javascript" src="../../../lib/lazr/build/overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../anim/anim.js"></script>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
++  <script type="text/javascript" src="../../overlay/overlay.js"></script>
    <!-- The module under test -->
--  <script type="text/javascript" src="../../../lib/lazr/build/choiceedit/choiceedit.js"></script>
++  <script type="text/javascript" src="../../choiceedit/choiceedit.js"></script>
    <!-- The test suite -->
    <script type="text/javascript" src="choiceedit.js"></script>
 === modified file 'src-js/lazrjs/choiceedit/tests/choiceedit.js'
 --- src-js/lazrjs/choiceedit/tests/choiceedit.js	2009-08-21 14:06:19 +0000
 +++ src-js/lazrjs/choiceedit/tests/choiceedit.js	2009-10-30 17:01:14 +0000
@@ -1,10 +1,11 @@
  /* Copyright (c) 2008, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/current/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.choiceedit', 'node', 'event', 'yuitest', 'widget-stack', 'console', function(Y) {
++    }).use('lazr.choiceedit', 'lazr.testing.runner', 'node',
++           'event', 'widget-stack', 'console', function(Y) {
  // Local aliases
  var Assert = Y.Assert,
@@ -525,15 +526,7 @@
+     }
  }));
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/formoverlay/formoverlay.js'
 --- src-js/lazrjs/formoverlay/formoverlay.js	2009-08-13 13:08:36 +0000
 +++ src-js/lazrjs/formoverlay/formoverlay.js	2009-10-30 17:01:14 +0000
@@ -8,6 +8,13 @@
   * @module lazr.formoverlay
   */
++
++var getCN = Y.ClassNameManager.getClassName,
++    NAME = 'lazr-formoverlay',
++    CONTENT_BOX  = 'contentBox',
++    RENDERUI = "renderUI",
++    BINDUI = "bindUI";
++
     /**
      * The FormOverlay class builds on the lazr.PrettyOverlay class
      * to display form content and extract form data for the callsite.
@@ -17,11 +24,12 @@
      */
  function FormOverlay(config) {
      FormOverlay.superclass.constructor.apply(this, arguments);
++
++    Y.after(this._renderUIFormOverlay, this, RENDERUI);
++    Y.after(this._bindUIFormOverlay, this, BINDUI);
++
+ }
--var getCN = Y.ClassNameManager.getClassName;
--var NAME = 'lazr-formoverlay';
--
  FormOverlay.NAME = NAME;
  /**
@@ -184,16 +192,19 @@
      /**
       * Create the nodes for the form and add them to the contentBody.
++     * <p>
++     * This method is invoked after renderUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method renderUI
++     * @method _renderUIFormOverlay
++     * @protected
       */
--    renderUI: function(){
--        FormOverlay.superclass.renderUI.apply(this);
--
++    _renderUIFormOverlay: function(){
          // Create a node that will contain the form header:
          this.form_header_node = Y.Node.create(
              FormOverlay.FORM_HEADER_TEMPLATE);
--
++
          // Create a form node that will contain the form content:
          this.form_node = Y.Node.create(FormOverlay.FORM_TEMPLATE);
@@ -216,51 +227,43 @@
          this.error_node = Y.Node.create(FormOverlay.ERROR_TEMPLATE);
          this._setFormContent();
--
      },
      /**
       * Bind the submit button to the _onFormSubmit() method.
++     * <p>
++     * This method is invoked after bindUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
       * @method bindUI
++     * @protected
       */
--    bindUI: function(){
--        this.constructor.superclass.bindUI.call(this);
--
--        Y.on(
--            "submit",
--            Y.bind(this._onFormSubmit, this),
--            this.form_node);
++    _bindUIFormOverlay: function(){
++        Y.on("submit",
++             Y.bind(this._onFormSubmit, this),
++             this.form_node);
          // Setup the cancel button to hide the formoverlay.
--        Y.on(
--            "click",
--            Y.bind(function(e){ this.hide();}, this),
--            this.get("form_cancel_button"));
--    },
--
--    /**
--     * Show the widget by setting the "visible" attribute to "true".
--     *
--     * Overridden here to ensure that the focus is given to the first
--     * input element whenever the FormOverlay is shown.
--     *
--     * @method show
--     */
--    show: function(){
--        // If the 'centered' configuration attribute is set to true,
--        // then we should always re-center relative to the current
--        // viewport when shown:
--        if (this.get('centered')){
--            this.centered();
--        }
--
--        this.constructor.superclass.show.call(this);
--
--        var form_elem = Y.Node.getDOMNode(this.form_node);
--        if (form_elem.elements.length > 0) {
--            form_elem.elements[0].focus();
--        }
++        Y.on("click",
++             Y.bind(function(e){ this.hide();}, this),
++             this.get("form_cancel_button"));
++
++        this.on("visibleChange", function(e) {
++            // If the 'centered' configuration attribute is set to true,
++            // then we should always re-center relative to the current
++            // viewport when shown:
++            if (e.newVal) {
++                if (this.get('centered')){
++                    this.centered();
++                }
++
++                var form_elem = Y.Node.getDOMNode(this.form_node);
++                if (form_elem.elements.length > 0) {
++                    Y.get(form_elem.elements[0]).focus();
++                }
++            }
++        });
      },
      /**
@@ -274,6 +277,7 @@
          this.form_header_node.set('innerHTML',
              this.get('form_header'));
++
          // Add the form content to the form node.
          // The form_content can be a string of HTML (as is useful when
          // it is obtained via AJAX) or a form node (as is useful if the
@@ -300,7 +304,7 @@
          body_node.appendChild(this.form_header_node);
          body_node.appendChild(this.form_node);
--        this.set("bodyContent", body_node);
++        this.setStdModContent(Y.WidgetStdMod.BODY, body_node, Y.WidgetStdMod.REPLACE);
      },
      /**
 === modified file 'src-js/lazrjs/formoverlay/tests/formoverlay.html'
 --- src-js/lazrjs/formoverlay/tests/formoverlay.html	2009-08-13 08:54:56 +0000
 +++ src-js/lazrjs/formoverlay/tests/formoverlay.html	2009-10-30 17:01:14 +0000
@@ -4,50 +4,26 @@
    <title>Form Overlay</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/3.0.0pr2/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/3.0.0pr2/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/3.0.0pr2/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/3.0.0pr2/build/cssbase/base.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
++  <link rel="stylesheet" href="../../testing/assets/testlogger.css"/>
    <!-- dependent modules from lazr-->
--  <script type="text/javascript" src="../../../lib/lazr/build/lazr/lazr.js"></script>
--  <script type="text/javascript" src="../../../lib/lazr/build/overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
    <!-- The module under test -->
--  <script type="text/javascript" src="../../../lib/lazr/build/formoverlay/formoverlay.js"></script>
++  <script type="text/javascript" src="../../formoverlay/formoverlay.js"></script>
    <!-- Testing helpers -->
--  <script type="text/javascript" src="../../../lib/lazr/build/testing/mockio.js"></script>
++  <script type="text/javascript" src="../../testing/mockio.js"></script>
    <!-- The test suite -->
    <script type="text/javascript" src="formoverlay.js"></script>
--  <style>
--  /* Taken and customized from testlogger.css */
--  #log .yui-console-content { width:44em }
--  #log .yui-console .yui-console-bd { height:30em }
--  #log .yui-console .yui-console-controls { display:none; }
--  #log .yui-console .yui-console-hd { display:none; }
--  #log .yui-console .yui-console-ft { position:absolute;top:0em; }
--
--  #log .yui-console-entry-src { display:none; }
--
--  #log .yui-console-entry-pass .yui-console-entry-cat {
--      background-color: green;
--      font-weight: bold;
--      color: white;
--  }
--  #log .yui-console-entry-fail .yui-console-entry-cat {
--      background-color: red;
--      font-weight: bold;
--      color: white;
--  }
--  #log .yui-console-entry-ignore .yui-console-entry-cat {
--      background-color: #666;
--      font-weight: bold;
--      color: white;
--  }
--  </style>
  </head>
  <body class="yui-skin-sam">
    <div id="form_overlay_example">
 === modified file 'src-js/lazrjs/formoverlay/tests/formoverlay.js'
 --- src-js/lazrjs/formoverlay/tests/formoverlay.js	2009-08-13 13:08:36 +0000
 +++ src-js/lazrjs/formoverlay/tests/formoverlay.js	2009-10-30 17:01:14 +0000
@@ -1,11 +1,12 @@
  /* Copyright (c) 2008, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/3.0.0pr2/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.formoverlay', 'lazr.testing', 'node', 'event', 'yuitest',
--           'dump', 'console', function(Y) {
++    }).use('lazr.formoverlay', 'lazr.testing.runner',
++           'lazr.testing.mockio', 'node', 'event', 'dump',
++           'console', function(Y) {
  var Assert = Y.Assert;  // For easy access to isTrue(), etc.
@@ -19,6 +20,17 @@
      Y.Event.simulate(rawnode, evtype, options);
+ }
++/* Helper function to cleanup and destroy a form overlay instance */
++function cleanup_form_overlay(form_overlay) {
++    if (form_overlay.get('rendered')) {
++        var bb = form_overlay.get('boundingBox');
++        bb.get('parentNode').removeChild(bb);
++    }
++
++    // Kill the widget itself.
++    form_overlay.destroy();
++}
++
  /* Helper function that creates a new form overlay instance. */
  function make_form_overlay(cfg) {
      var form_overlay = new Y.lazr.FormOverlay(cfg);
@@ -44,21 +56,14 @@
          });
          // Ensure window size is constant for tests
--        window.resizeTo(800, 600);
++        this.width = window.top.outerWidth;
++        this.height = window.top.outerHeight;
++        window.top.resizeTo(800, 600);
      },
      tearDown: function() {
--        this.cleanUp(this.form_overlay);
--    },
--
--    cleanUp: function(form_overlay) {
--        if (form_overlay.get('rendered')) {
--            var bb = form_overlay.get('boundingBox');
--            bb.get('parentNode').removeChild(bb);
--        }
--
--        // Kill the widget itself.
--        form_overlay.destroy();
++        window.top.resizeTo(this.width, this.height);
++        cleanup_form_overlay(this.form_overlay);
      },
      test_form_overlay_can_be_instantiated: function() {
@@ -67,45 +72,36 @@
              Y.lazr.FormOverlay,
              overlay,
              "Form overlay could not be instantiated.");
--    },
--
--    // This fails because YUI adds an extra div for some reason.
--    // If and when this is fixed, and this passes, we'll need to
--    // update test_form_content_in_bodyContent below.
--    _should: {
--        fail: {test_bodyContent_is_single_node: true}
--    },
--
--    test_bodyContent_is_single_node: function() {
++        cleanup_form_overlay(overlay);
++    },
++
++    test_body_content_is_single_node: function() {
          Assert.areEqual(
 ,
--            this.form_overlay.get("bodyContent").size(),
--            "The bodyContent should be a single node, not a node list.");
++            this.form_overlay.getStdModNode("body").size(),
++            "The body content should be a single node, not a node list.");
      },
--    test_form_content_in_bodyContent: function() {
--        // The form_content should be included in the bodyContent of the
++    test_form_content_in_body_content: function() {
++        // The form_content should be included in the body of the
          // overlay during initialization.
--        var body_content = this.form_overlay.get("bodyContent");
++        var body_content = this.form_overlay.getStdModNode("body");
          // Ensure the body_content contains our form node.
--        // Note: see failing test_bodyContent_is_single_node above for why
--        // an index is used here.
          Assert.isTrue(
--            body_content.contains(this.form_overlay.form_node)[1],
++            body_content.contains(this.form_overlay.form_node),
              "The form node is part of the body content.");
          // And then make sure that the user-supplied form_content is
          // included in the form node:
          Assert.areNotEqual(
--            body_content.get("innerHTML")[1].search(
++            body_content.get("innerHTML").search(
                  this.form_overlay.get("form_content")));
      },
      test_first_input_has_focus: function() {
          // The first input element in the form content should have
          // focus.
--
          var first_input = this.form_overlay.form_node.query('#field1');
          // Hide the overlay and ensure that the first input does not
@@ -125,26 +121,23 @@
              });
          };
--        Y.on('focus', onFocus, first_input);
++        first_input.on('focus', onFocus);
          this.form_overlay.show();
          this.wait(5000);
      },
--    test_form_submit_in_bodyContent: function() {
--        // The bodyContent should include the submit button.
--
--        var body_content = this.form_overlay.get("bodyContent");
--        // Note: see failing test_bodyContent_is_single_node above for why
--        // an index is used here.
++    test_form_submit_in_body_content: function() {
++        // The body content should include the submit button.
++        var body_content = this.form_overlay.getStdModNode("body");
          Assert.isTrue(
              body_content.contains(
--                this.form_overlay.get("form_submit_button"))[1],
--            "The bodyContent includes the form_submit_button.");
++                this.form_overlay.get("form_submit_button")),
++            "The body content includes the form_submit_button.");
      },
--    test_users_submit_button_in_bodyContent: function() {
++    test_users_submit_button_in_body_content: function() {
          // If a user supplies a custom submit button, it should be included
          // in the form instead of the default one.
          var submit_button = Y.Node.create(
@@ -161,22 +154,19 @@
              form_overlay.form_node.contains(submit_button),
              "The form should include the users submit button.");
--        this.cleanUp(form_overlay);
++        cleanup_form_overlay(form_overlay);
      },
--    test_form_cancel_in_bodyContent: function() {
--        // The bodyContent should include the cancel button.
--
--        var body_content = this.form_overlay.get("bodyContent");
--        // Note: see failing test_bodyContent_is_single_node above for why
--        // an index is used here.
++    test_form_cancel_in_body_content: function() {
++        // The body content should include the cancel button.
++        var body_content = this.form_overlay.getStdModNode("body");
          Assert.isTrue(
              body_content.contains(
--                this.form_overlay.get("form_cancel_button"))[1],
--            "The bodyContent includes the form_cancel_button.");
++                this.form_overlay.get("form_cancel_button")),
++            "The body content includes the form_cancel_button.");
      },
--    test_users_cancel_button_in_bodyContent: function() {
++    test_users_cancel_button_in_body_content: function() {
          // If a user supplies a custom cancel button, it should be included
          // in the form instead of the default one.
          var cancel_button = Y.Node.create(
@@ -193,7 +183,7 @@
              form_overlay.form_node.contains(cancel_button),
              "The form should include the users cancel button.");
--        this.cleanUp(form_overlay);
++        cleanup_form_overlay(form_overlay);
      },
      test_hide_when_cancel_clicked: function() {
@@ -219,11 +209,9 @@
          this.form_overlay.showError("My special error");
--        var body_content = this.form_overlay.get("bodyContent");
--        // Note: see failing test_bodyContent_is_single_node above for why
--        // an index is used here.
++        var body_content = this.form_overlay.getStdModNode("body");
          Assert.areNotEqual(
--            body_content.get("innerHTML")[1].search("My special error"),
++            body_content.get("innerHTML").search("My special error"),
              -1,
              "The error text was included in the body content.");
      },
@@ -234,12 +222,10 @@
          // chars. Not sure what to do about unicode, for eg.
          this.form_overlay.showError("<h2>My special error</h2>");
--        var body_content = this.form_overlay.get("bodyContent");
--        // Note: see failing test_bodyContent_is_single_node above for why
--        // an index is used here.
++        var body_content = this.form_overlay.getStdModNode("body");
          Assert.areEqual(
              -1,
--            body_content.get("innerHTML")[1].search("<h2>"),
++            body_content.get("innerHTML").search("<h2>"),
              "The tags were stripped from the error message.");
      },
@@ -247,9 +233,9 @@
          // The error message should be cleared from the body content.
          this.form_overlay.showError("My special error");
          this.form_overlay.clearError();
--        var body_content = this.form_overlay.get("bodyContent");
++        var body_content = this.form_overlay.getStdModNode("body");
          Assert.areEqual(
--            body_content.get("innerHTML")[1].search("My special error"),
++            body_content.get("innerHTML").search("My special error"),
              -1,
              "The error text is cleared from the body content.");
      },
@@ -272,7 +258,7 @@
          this.form_overlay.hide();
          // The position is updated after resizing the window and re-showing:
--        window.resizeTo(850, 550);
++        window.top.resizeTo(850, 550);
          this.form_overlay.show();
          Assert.areNotEqual(
              Y.dump(centered_pos_before_resize),
@@ -305,6 +291,7 @@
          Assert.isTrue(
              callback_called,
              "The form_submit_callback should be called.");
++        cleanup_form_overlay(form_overlay);
      },
      test_submit_with_callback_prevents_propagation: function() {
@@ -334,6 +321,7 @@
              Assert.isFalse(
                  event_was_propagated,
                  "The onsubmit event should not be propagated.");
++            cleanup_form_overlay(form_overlay);
          }, 3000);
      },
@@ -352,6 +340,8 @@
                  Assert.isTrue(event_was_propagated,
                      "The normal form submission event is propagated as " +
                      "normal when no callback is provided.");
++                cleanup_form_overlay(form_overlay);
++
              });
              e.preventDefault();
          };
@@ -382,6 +372,7 @@
              '{field1 => [val1], field2 => [val2], field3 => [val3]}',
              Y.dump(form_overlay.getFormData()),
              "The getFormData method returns simple input data correctly.");
++        cleanup_form_overlay(form_overlay);
      },
      test_getFormData_returns_inputs_nested_several_levels: function() {
@@ -406,6 +397,7 @@
              '{field1 => [val1], field2 => [val2], field3 => [val3]}',
              Y.dump(form_overlay.getFormData()),
              "The getFormData method returns simple input data correctly.");
++        cleanup_form_overlay(form_overlay);
      },
@@ -425,6 +417,7 @@
          Assert.isTrue(
              form_overlay.form_node.contains(input_node),
              "Failed to pass the form content as a Y.Node instance.");
++        cleanup_form_overlay(form_overlay);
      },
      test_form_content_loaded_from_url_success: function() {
@@ -455,6 +448,7 @@
          Assert.areEqual(
              external_form_content, form_node_text.match(external_form_content),
              "Failed to render the form.");
++        cleanup_form_overlay(form_overlay);
      },
      test_form_content_loaded_from_url_failure: function() {
@@ -482,6 +476,7 @@
          Assert.areEqual(
              error_message, form_node_text.match(error_message),
              "Failed to render the error message.");
++        cleanup_form_overlay(form_overlay);
      },
      test_form_content_loaded_from_url_bind_submit: function() {
@@ -511,18 +506,11 @@
              "input[type=submit]",
              'click');
          Assert.isTrue(callback_called, "Submit button didn't get hooked up.");
++        cleanup_form_overlay(form_overlay);
+     }
  }));
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/inlineedit/editor.js'
 --- src-js/lazrjs/inlineedit/editor.js	2009-10-28 19:04:25 +0000
 +++ src-js/lazrjs/inlineedit/editor.js	2009-10-30 17:01:14 +0000
@@ -158,7 +158,7 @@
       */
      submit_button: {
          value: null,
--        set: function(v) { return this._setNode(v); }
++        setter: function(v) { return this._setNode(v); }
      },
      /**
@@ -170,7 +170,7 @@
       */
      cancel_button: {
          value: null,
--        set: function(v) { return this._setNode(v); }
++        setter: function(v) { return this._setNode(v); }
      },
      /**
@@ -182,7 +182,7 @@
       */
      top_buttons: {
          value: null,
--        set: function(v) { return this._setNode(v); }
++        setter: function(v) { return this._setNode(v); }
      },
      /**
@@ -194,7 +194,7 @@
       */
      bottom_buttons: {
          value: null,
--        set: function(v) { return this._setNode(v); }
++        setter: function(v) { return this._setNode(v); }
      },
      /**
@@ -205,7 +205,7 @@
       */
      error_message: {
          value: null,
--        set: function(v) { return this._setNode(v); }
++        setter: function(v) { return this._setNode(v); }
      },
      /**
@@ -283,23 +283,6 @@
  Y.extend(InlineEditor, Y.Widget, {
      /**
--     * An extra button box at the top, shown only in multi-line mode.
--     *
--     * @property top_buttons
--     * @type Node
--     */
--    top_buttons: null,
--
--    /**
--     * A reference to the button-box html element in single-line mode, and
--     * the bottom button box in multi-line mode.
--     *
--     * @property buttons
--     * @type Node
--     */
--    buttons: null,
--
--    /**
       * A convenience method for retrieving a Node value from a Node
       * instance, an HTMLElement, or a CSS string selector.
+      *
@@ -337,7 +320,6 @@
       * @method save
       */
      save: function() {
--
          // We don't want to save any whitespace characters.
          var input = Y.Lang.trim(this.getInput());
@@ -1045,7 +1027,7 @@
       * @type Node
       */
      trigger: {
--        set: function(node) {
++        setter: function(node) {
              if (this.get(RENDERED)) {
                  this._bindTrigger(node);
+             }
@@ -1061,7 +1043,7 @@
       * @type Node
       */
      text: {
--        set: function(v) {
++        setter: function(v) {
              return Y.Node.get(v);
          },
          validator: function(v) {
@@ -1081,10 +1063,10 @@
       * @readOnly
       */
      value: {
--        get: function() {
++        getter: function() {
              var text_node = this.get(TEXT);
              var ptags = text_node.queryAll('p');
--            if (Y.Lang.isValue(ptags)) {
++            if (Y.Lang.isValue(ptags) && ptags.size()) {
                  var lines = [];
                  ptags.each(function(ptag) {
                      lines = lines.concat([ptag.get('text'), '\n\n']);
@@ -1106,7 +1088,7 @@
       */
      accept_empty: {
          value: false,
--        get: function() {
++        getter: function() {
              if (this.editor) {
                  return this.editor.get(ACCEPT_EMPTY);
+             }
@@ -1431,7 +1413,7 @@
          if (this._click_handler) {
              this._click_handler.detach();
+         }
--        this._click_handler = Y.on('click', this._triggerEdit, node, this);
++        this._click_handler = node.on('click', this._triggerEdit, this);
      },
@@ -1496,5 +1478,5 @@
  //~ Y.log("Module loaded", 'info', 'lazr.editor');
--}, '0.2', {requires:
--    ['oop', 'event', 'node', 'widget', 'lazr.anim', 'lazr.base']});
++}, '0.2', {requires: ['oop', 'anim', 'event', 'node', 'widget',
++                      'lazr.anim', 'lazr.base']});
 === modified file 'src-js/lazrjs/inlineedit/tests/index.html'
 --- src-js/lazrjs/inlineedit/tests/index.html	2009-05-14 18:21:37 +0000
 +++ src-js/lazrjs/inlineedit/tests/index.html	2009-10-30 17:01:14 +0000
@@ -5,33 +5,23 @@
    <title>Inline Edit</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/current/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssbase/base.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
++  <link rel="stylesheet" href="../../testing/assets/testlogger.css"/>
    <!-- The module under test -->
--  <script type="text/javascript" src="../../../build/inlineedit/editor.js"></script>
--  <script type="text/javascript" src="../../../build/anim/anim.js"></script>
--  <script type="text/javascript" src="../../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../inlineedit/editor.js"></script>
++  <script type="text/javascript" src="../../anim/anim.js"></script>
++  <script type="text/javascript" src="../../lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
    <!-- The test suite -->
    <script type="text/javascript" src="inline_edit.js"></script>
--  <link rel="stylesheet" href="../../../src/testing/assets/testlogger.css"/>
  </head>
  <body class="yui-skin-sam">
--  <h1>Single-line editing</h1>
--  <div id="editable_single_text">
--    <span id="single_text" class="yui-editable_text-text">Some editable inline text.</span>
--    <button id="single_edit" class="yui-editable_text-trigger">Edit this</button>
--  </div>
--  <hr />
--  <h1>Multi-line editing</h1>
--  <div id="editable_multi_text">
--    <button id="multi_edit" class="yui-editable_text-trigger">Edit this</button>
--    <span id="multi_text" class="yui-editable_text-text">Some editable multi-line text.</span>
--  </div>
    <div id="log"></div>
  </body>
  </html>
 === modified file 'src-js/lazrjs/inlineedit/tests/inline_edit.js'
 --- src-js/lazrjs/inlineedit/tests/inline_edit.js	2009-08-13 08:54:56 +0000
 +++ src-js/lazrjs/inlineedit/tests/inline_edit.js	2009-10-30 17:01:14 +0000
@@ -1,10 +1,24 @@
  /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/current/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.editor', 'node', 'event', 'yuitest', 'console', function(Y) {
++    }).use('lazr.editor', 'lazr.testing.runner', 'node', 'event', 'console', function(Y) {
++
++var SAMPLE_HTML = "                                                                            \
++  <h1>Single-line editing</h1>                                                                 \
++  <div id='editable_single_text'>                                                              \
++    <span id='single_text' class='yui-editable_text-text'>Some editable inline text.</span>    \
++    <button id='single_edit' class='yui-editable_text-trigger'>Edit this</button>              \
++  </div>                                                                                       \
++  <hr />                                                                                       \
++  <h1>Multi-line editing</h1>                                                                  \
++  <div id='editable_multi_text'>                                                               \
++    <button id='multi_edit' class='yui-editable_text-trigger'>Edit this</button>               \
++    <span id='multi_text' class='yui-editable_text-text'>Some editable multi-line text.</span> \
++  </div>                                                                                       \
++";
  var Assert = Y.Assert;  // For easy access to isTrue(), etc.
@@ -46,6 +60,15 @@
      widget.destroy();
+ }
++function setup_sample_html() {
++    if (! Y.get("#scaffolding")) {
++        Y.get(document.body).appendChild(
++            Y.Node.create("<div id='scaffolding'></div>"));
++    }
++
++    Y.get("#scaffolding").set("innerHTML", SAMPLE_HTML);
++}
++
  function make_editable_text(cfg) {
      // For the editor
      // TODO: fix this ugly hack
@@ -396,6 +419,7 @@
      name: 'Editable text initial values',
      setUp: function() {
++        setup_sample_html();
          this.etext = make_editable_text(
              {initial_value_override: 'Initial value'});
      },
@@ -621,6 +645,7 @@
      name: 'editable_text',
      setUp: function() {
++        setup_sample_html();
          this.etext = make_editable_text();
      },
@@ -704,6 +729,7 @@
          this.etext.editor
              .get('input_field')
              .set('value', expected_value);
++
          this.etext.editor.save();
          Assert.areEqual(
@@ -801,6 +827,7 @@
      name: "EditableText single-line/multi-line modes",
      setUp: function() {
++        setup_sample_html();
          this.single = make_editable_text({
              contentBox: '#editable_single_text',
              multiline: false
@@ -843,7 +870,7 @@
      },
      test_single_line_top_button_box: function() {
--        var box = this.single.editor.top_buttons;
++        var box = this.single.editor.get("top_buttons");
          Assert.areEqual(
              null,
              box,
@@ -851,12 +878,12 @@
      },
      test_multi_line_top_button_box: function() {
--        var box = this.multi.editor.top_buttons;
++        var box = this.multi.editor.get("top_buttons");
          Assert.areNotEqual(
              null,
              box,
              "Multi-line editor should have a top button box.");
--    }
++    },
  }));
@@ -1116,15 +1143,7 @@
+     }
  }));
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/overlay/overlay.js'
 --- src-js/lazrjs/overlay/overlay.js	2009-04-19 22:48:09 +0000
 +++ src-js/lazrjs/overlay/overlay.js	2009-10-30 17:01:14 +0000
@@ -11,7 +11,9 @@
  var ESCAPE = 27,
      CANCEL = 'cancel',
      BOUNDING_BOX = 'boundingBox',
--    CONTENT_BOX = 'contentBox';
++    CONTENT_BOX = 'contentBox',
++    BINDUI = "bindUI";
++
     /**
      * An Overlay subclass which draws a rounded-corner, drop-shadow
@@ -36,6 +38,8 @@
              arguments[0].zIndex = 1000;
+         }
          PrettyOverlay.superclass.constructor.apply(this, arguments);
++        Y.after(this._bindUIPrettyOverlay, this, BINDUI);
++
      };
      PrettyOverlay.NAME = 'pretty-overlay';
@@ -221,8 +225,14 @@
           * @method _removeBlockingDiv
           */
          _removeBlockingDiv: function() {
--            if (Y.get('.blocking-div')) {
--                Y.get('body').removeChild(this._blocking_div);
++            if (this._blocking_div) {
++                var blocking_div = Y.get(this._blocking_div);
++                if (blocking_div) {
++                    var parent = blocking_div.get('parentNode');
++                    if (parent) {
++                        parent.removeChild(this._blocking_div);
++                    }
++                }
+             }
          },
@@ -236,13 +246,16 @@
          },
          /**
--         * Bind UI events. Subclasses must call this function using
--         * <code>this.constructor.superclass.bindUI.call(this)</code>.
++         * Bind UI events.
++         * <p>
++         * This method is invoked after bindUI is invoked for the Widget class
++         * using YUI's aop infrastructure.
++         * </p>
+          *
++         * @method _bindUIPrettyOverlay
           * @protected
--         * @method bindUI
           */
--        bindUI: function() {
++        _bindUIPrettyOverlay: function() {
              var self = this;
              var close_button = this.get(BOUNDING_BOX).query('.close a');
              close_button.on('click', function(e) {
@@ -352,4 +365,4 @@
      Y.lazr.PrettyOverlay = PrettyOverlay;
--}, '0.1', {requires: ['oop', 'overlay', 'event']});
++}, '0.1', {requires: ['oop', 'overlay', 'event', 'widget-position']});
 === modified file 'src-js/lazrjs/overlay/tests/overlay.html'
 --- src-js/lazrjs/overlay/tests/overlay.html	2009-02-20 17:41:32 +0000
 +++ src-js/lazrjs/overlay/tests/overlay.html	2009-10-30 17:01:14 +0000
@@ -5,14 +5,15 @@
    <title>Pretty Overlay</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/current/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssbase/base.css"/>
--  <link rel="stylesheet" href="../../../src/testing/assets/testlogger.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
++  <link rel="stylesheet" href="../../testing/assets/testlogger.css"/>
    <!-- The module under test -->
--  <script type="text/javascript" src="../../../build/overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
    <!-- The test suite -->
    <script type="text/javascript" src="overlay.js"></script>
 === modified file 'src-js/lazrjs/overlay/tests/overlay.js'
 --- src-js/lazrjs/overlay/tests/overlay.js	2009-02-20 18:05:48 +0000
 +++ src-js/lazrjs/overlay/tests/overlay.js	2009-10-30 17:01:14 +0000
@@ -1,10 +1,11 @@
  /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/current/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.overlay', 'node', 'event', 'yuitest', 'widget-stack', 'console', function(Y) {
++    }).use('lazr.overlay', 'lazr.testing.runner', 'node',
++           'event', 'widget-stack', 'console', function(Y) {
  // KeyCode for escape
  var ESCAPE = 27;
@@ -85,8 +86,8 @@
      },
      test_overlay_can_hide_progressbar: function() {
--        this.overlay = new Y.lazr.PrettyOverlay();
--        this.overlay.render({progressbar: false});
++        this.overlay = new Y.lazr.PrettyOverlay({progressbar: false});
++        this.overlay.render();
          var bb = this.overlay.get('boundingBox');
          bb.set('headerContent', 'ALL HAIL DISCORDIA!');
          Assert.isNull(
@@ -106,8 +107,8 @@
      },
      test_overlay_can_hide_steptitle: function() {
--        this.overlay = new Y.lazr.PrettyOverlay();
--        this.overlay.render({progressbar: false});
++        this.overlay = new Y.lazr.PrettyOverlay({progressbar: false});
++        this.overlay.render();
          var bb = this.overlay.get('boundingBox');
          bb.set('headerContent', 'ALL HAIL DISCORDIA!');
          Assert.isNull(
@@ -230,15 +231,7 @@
  }));
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/picker/picker.js'
 --- src-js/lazrjs/picker/picker.js	2009-07-06 16:18:36 +0000
 +++ src-js/lazrjs/picker/picker.js	2009-10-30 17:01:14 +0000
@@ -54,10 +54,18 @@
      FOOTER_SLOT = 'footer_slot',
      SELECTED_BATCH = 'selected_batch',
      SEARCH_MODE = 'search_mode',
--    NO_RESULTS_SEARCH_MESSAGE = 'no_results_search_message';
++    NO_RESULTS_SEARCH_MESSAGE = 'no_results_search_message',
++    RENDERUI = "renderUI",
++    BINDUI = "bindUI",
++    SYNCUI = "syncUI";
++
  var Picker = function () {
      Picker.superclass.constructor.apply(this, arguments);
++
++    Y.after(this._renderUIPicker, this, RENDERUI);
++    Y.after(this._bindUIPicker, this, BINDUI);
++    Y.after(this._syncUIPicker, this, BINDUI);
  };
  Y.extend(Picker, Y.lazr.PrettyOverlay, {
@@ -204,7 +212,7 @@
          var options = this.get(BATCHES);
          // Clear previous batches.
--        Y.Event.purgeElement(this.batches_box, true);
++        Y.Event.purgeElement(this._batches_box, true);
          this._batches_box.set('innerHTML', '');
          if (options.length === 0) {
@@ -232,7 +240,7 @@
              this._batches_box.appendChild(batch_item);
              batch_item.on('click', function (e) {
--                this.set('selected_batch', i);
++                this.set(SELECTED_BATCH, i);
                  this.fire(
                      SEARCH, this.get(CURRENT_SEARCH_STRING), data.value);
              }, this);
@@ -259,7 +267,7 @@
          var idx = this.get(SELECTED_BATCH);
          var items = this._batches_box.queryAll('span');
--        if (items) {
++        if (items.size()) {
              this._prev_button.set('disabled', idx === 0);
              items.removeClass(C_SELECTED_BATCH);
              items.item(idx).addClass(C_SELECTED_BATCH);
@@ -377,12 +385,15 @@
      /**
       * Create the widget's HTML components.
++     * <p>
++     * This method is invoked after renderUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method renderUI
++     * @method _renderUIPicker
       * @protected
       */
--    renderUI: function() {
--        Picker.superclass.renderUI.apply(this, arguments);
++    _renderUIPicker: function() {
          this._search_button = Y.Node.create(Y.lazr.ui.SEARCH_BUTTON);
          var search_box = Y.Node.create([
@@ -415,26 +426,27 @@
          this._footer_slot_box = Y.Node.create('<div></div');
          this._footer_slot_box.addClass(C_FOOTER_SLOT);
--        //We cannot set the bodyContent element here, because
--        //YUI screwed it up. So fake it.
          var body = Y.Node.create('<div></div>');
          body.appendChild(search_box);
          body.appendChild(this._batches_box);
          body.appendChild(this._results_box);
          body.appendChild(this._footer_slot_box);
          body.addClass('yui-widget-bd');
--        this.get(CONTENT_BOX).appendChild(body);
++
++        this.setStdModContent(Y.WidgetStdMod.BODY, body, Y.WidgetStdMod.APPEND);
      },
      /**
       * Bind the widget's DOM elements to their event handlers.
++     * <p>
++     * This method is invoked after bindUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method bindUI
++     * @method _bindUIPicker
       * @protected
       */
--    bindUI: function() {
--        Picker.superclass.bindUI.apply(this, arguments);
--
++    _bindUIPicker: function() {
          Y.on('click', this._defaultSearchUserAction, this._search_button,
               this);
@@ -445,8 +457,10 @@
          // Give the focus to the search input.
          Y.on('focus', function (e) {
--            e.halt();
--            this._search_input.focus();
++            if (e.target !== this._search_input){
++                e.halt();
++                this._search_input.focus();
++            }
          }, this.get(BOUNDING_BOX), this);
          // Focus search box when the widget is first displayed.
@@ -485,7 +499,14 @@
          // is changed, and reset the selected one to the first one.
          this.after('batchesChange', function (e) {
              this._syncBatchesUI();
--            this.set(SELECTED_BATCH, 0);
++            if (this.get(SELECTED_BATCH) == 0){
++                // If the attribute is already set to the same value,
++                // the 'after' events won't be triggered, so we have
++                // to trigger it manually.
++                this._syncSelectedBatchUI();
++            } else {
++                this.set(SELECTED_BATCH, 0);
++            }
          }, this);
          // Keep the UI in sync with the currently selected batch.
@@ -512,12 +533,15 @@
      /**
       * Synchronize the search box, error message and results with the UI.
++     * <p>
++     * This method is invoked after syncUI is invoked for the Widget class
++     * using YUI's aop infrastructure.
++     * </p>
+      *
--     * @method syncUI
++     * @method _syncUIPicker
       * @protected
       */
--    syncUI: function() {
--        Picker.superclass.syncUI.apply(this, arguments);
++    _syncUIPicker: function() {
          this._syncResultsUI();
          this._syncSearchModeUI();
          this._syncBatchesUI();
@@ -686,7 +710,7 @@
       */
      selected_batch: {
          value: 0,
--        get: function (value) {
++        getter: function (value) {
              return value || 0;
          },
          validator: function (value) {
@@ -728,8 +752,7 @@
  Y.Picker = Picker;
--}, '0.1', {
--    requires: [
--        'oop', 'event', 'node', 'substitute', 'lazr.overlay', 'lazr.anim',
--        'lazr.base']
++}, '0.1', {requires: ['oop', 'event', 'event-focus', 'node',
++                      'substitute', 'widget', 'widget-stdmod',
++                      'lazr.overlay', 'lazr.anim', 'lazr.base']
  });
 === modified file 'src-js/lazrjs/picker/tests/picker.html'
 --- src-js/lazrjs/picker/tests/picker.html	2009-02-20 17:19:40 +0000
 +++ src-js/lazrjs/picker/tests/picker.html	2009-10-30 17:01:14 +0000
@@ -1,50 +1,25 @@
--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
    <head>
    <title>Picker</title>
    <!-- YUI 3.0 Setup -->
--  <script type="text/javascript" src="../../../lib/yui/current/build/yui/yui.js"></script>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssreset/reset.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssfonts/fonts.css"/>
--  <link rel="stylesheet" href="../../../lib/yui/current/build/cssbase/base.css"/>
++  <script type="text/javascript" src="../../yui/current/build/yui/yui.js"></script>
++  <link rel="stylesheet" href="../../yui/current/build/cssreset/reset.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssfonts/fonts.css"/>
++  <link rel="stylesheet" href="../../yui/current/build/cssbase/base.css"/>
++  <link rel="stylesheet" href="../../testing/assets/testlogger.css"/>
    <!-- The module under test -->
--  <script type="text/javascript" src="../../../build/overlay/overlay.js"></script>
--  <script type="text/javascript" src="../../../build/picker/picker.js"></script>
--  <script type="text/javascript" src="../../../build/anim/anim.js"></script>
--  <script type="text/javascript" src="../../../build/lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../overlay/overlay.js"></script>
++  <script type="text/javascript" src="../../picker/picker.js"></script>
++  <script type="text/javascript" src="../../anim/anim.js"></script>
++  <script type="text/javascript" src="../../lazr/lazr.js"></script>
++  <script type="text/javascript" src="../../testing/testing.js"></script>
    <!-- The test suite -->
    <script type="text/javascript" src="picker.js"></script>
--
--  <style>
--  /* Taken and customized from testlogger.css */
--  #log .yui-console-content { width:44em }
--  #log .yui-console .yui-console-bd { height:30em }
--  #log .yui-console .yui-console-controls { display:none; }
--  #log .yui-console .yui-console-hd { display:none; }
--  #log .yui-console .yui-console-ft { position:absolute;top:0em; }
--
--  #log .yui-console-entry-src { display:none; }
--
--  #log .yui-console-entry-pass .yui-console-entry-cat {
--      background-color: green;
--      font-weight: bold;
--      color: white;
--  }
--  #log .yui-console-entry-fail .yui-console-entry-cat {
--      background-color: red;
--      font-weight: bold;
--      color: white;
--  }
--  #log .yui-console-entry-ignore .yui-console-entry-cat {
--      background-color: #666;
--      font-weight: bold;
--      color: white;
--  }
--  </style>
  </head>
  <body class="yui-skin-sam">
    <div id="log"></div>
 === modified file 'src-js/lazrjs/picker/tests/picker.js'
 --- src-js/lazrjs/picker/tests/picker.js	2009-07-07 09:38:20 +0000
 +++ src-js/lazrjs/picker/tests/picker.js	2009-10-30 17:01:14 +0000
@@ -1,10 +1,11 @@
  /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
  YUI({
--    base: '../../../lib/yui/current/build/',
++    base: '../../yui/current/build/',
      filter: 'raw',
      combine: false
--    }).use('lazr.picker', 'node', 'event', 'yuitest', 'console', 'dump',
++    }).use('lazr.picker', 'lazr.testing.runner', 'node',
++           'event', 'event-focus', 'console', 'dump',
             function(Y) {
  // Local aliases
@@ -487,7 +488,7 @@
              bb.query('.yui-picker-batches span'),
              "Container for batches not found.");
          var batches = bb.queryAll('.yui-picker-batches span');
--        Assert.isNotNull(batches, "Batches  not found");
++        Assert.isNotNull(batches, "Batches not found");
          Assert.areEqual(2, batches.size());
          ArrayAssert.itemsAreEqual(
              ['New', 'Assigned'],
@@ -782,15 +783,7 @@
  }));
--Y.Test.Runner.add(suite);
--
--var yconsole = new Y.Console({
--    newestOnTop: false
--});
--yconsole.render('#log');
--
--Y.on('domready', function() {
--    Y.Test.Runner.run();
--});
++Y.lazr.testing.Runner.add(suite);
++Y.lazr.testing.Runner.run();
  });
 === modified file 'src-js/lazrjs/testing/assets/testlogger.css'
 --- src-js/lazrjs/testing/assets/testlogger.css	2009-02-20 17:41:32 +0000
 +++ src-js/lazrjs/testing/assets/testlogger.css	2009-10-30 17:01:14 +0000
@@ -1,6 +1,6 @@
  /* Taken and customized from testlogger.css */
--#log .yui-console-content { width: 44em }
--#log .yui-console .yui-console-bd { height: 30em }
++/*#log .yui-console-content { width: 44em }*/
++/*#log .yui-console .yui-console-bd { height: 30em }*/
  #log .yui-console .yui-console-controls { display: none; }
  #log .yui-console .yui-console-hd { display: none; }
  #log .yui-console .yui-console-ft { position: absolute; top: 0; }
 === added file 'src-js/lazrjs/testing/jsUnitMockTimeout.js'
 --- src-js/lazrjs/testing/jsUnitMockTimeout.js	1970-01-01 00:00:00 +0000
 +++ src-js/lazrjs/testing/jsUnitMockTimeout.js	2009-10-30 17:01:14 +0000
@@ -0,0 +1,120 @@
++/*
++    Version: MPL 1.1/GPL 2.0/LGPL 2.1
++
++    The contents of this file are subject to the Mozilla Public License Version
++    1.1 (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.mozilla.org/MPL/
++
++    Software distributed under the License is distributed on an "AS IS" basis,
++    WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
++    for the specific language governing rights and limitations under the
++    License.
++
++    The Original Code is Edward Hieatt code.
++
++    The Initial Developer of the Original Code is
++    Edward Hieatt, edward@jsunit.net.
++    Portions created by the Initial Developer are Copyright (C) 2003
++    the Initial Developer. All Rights Reserved.
++
++    Author Edward Hieatt, edward@jsunit.net
++
++    Alternatively, the contents of this file may be used under the terms of
++    either the GNU General Public License Version 2 or later (the "GPL"), or
++    the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
++    in which case the provisions of the GPL or the LGPL are applicable instead
++    of those above. If you wish to allow use of your version of this file only
++    under the terms of either the GPL or the LGPL, and not to allow others to
++    use your version of this file under the terms of the MPL, indicate your
++    decision by deleting the provisions above and replace them with the notice
++    and other provisions required by the LGPL or the GPL. If you do not delete
++    the provisions above, a recipient may use your version of this file under
++    the terms of any one of the MPL, the GPL or the LGPL.
++*/
++
++// Mock setTimeout, clearTimeout
++// Contributed by Pivotal Computer Systems, www.pivotalsf.com
++//
++// Copied from the JsUnit 2.2alpha1 release, made in Mar 24 2006
++// (http://www.jsunit.net/)
++
++var Clock = {
++    timeoutsMade: 0,
++    scheduledFunctions: {},
++    nowMillis: 0,
++    reset: function() {
++        this.scheduledFunctions = {};
++        this.nowMillis = 0;
++        this.timeoutsMade = 0;
++    },
++    tick: function(millis) {
++        var oldMillis = this.nowMillis;
++        var newMillis = oldMillis + millis;
++        this.runFunctionsWithinRange(oldMillis, newMillis);
++        this.nowMillis = newMillis;
++    },
++    runFunctionsWithinRange: function(oldMillis, nowMillis) {
++        var scheduledFunc;
++        var funcsToRun = [];
++        for (var timeoutKey in this.scheduledFunctions) {
++            scheduledFunc = this.scheduledFunctions[timeoutKey];
++            if (scheduledFunc != undefined &&
++                scheduledFunc.runAtMillis >= oldMillis &&
++                scheduledFunc.runAtMillis <= nowMillis) {
++                funcsToRun.push(scheduledFunc);
++                this.scheduledFunctions[timeoutKey] = undefined;
++            }
++        }
++
++        if (funcsToRun.length > 0) {
++            funcsToRun.sort(function(a, b) {
++                return a.runAtMillis - b.runAtMillis;
++            });
++            for (var i = 0; i < funcsToRun.length; ++i) {
++                try {
++                    this.nowMillis = funcsToRun[i].runAtMillis;
++                    funcsToRun[i].funcToCall();
++                    if (funcsToRun[i].recurring) {
++                        Clock.scheduleFunction(funcsToRun[i].timeoutKey,
++                                funcsToRun[i].funcToCall,
++                                funcsToRun[i].millis,
++                                true);
++                    }
++                } catch(e) {
++                    console.log(e);
++                }
++            }
++            this.runFunctionsWithinRange(oldMillis, nowMillis);
++        }
++    },
++    scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) {
++        Clock.scheduledFunctions[timeoutKey] = {
++            runAtMillis: Clock.nowMillis + millis,
++            funcToCall: funcToCall,
++            recurring: recurring,
++            timeoutKey: timeoutKey,
++            millis: millis
++        };
++    }
++};
++
++function setTimeout(funcToCall, millis) {
++    Clock.timeoutsMade = Clock.timeoutsMade + 1;
++    Clock.scheduleFunction(Clock.timeoutsMade, funcToCall, millis, false);
++    return Clock.timeoutsMade;
++}
++
++function setInterval(funcToCall, millis) {
++    Clock.timeoutsMade = Clock.timeoutsMade + 1;
++    Clock.scheduleFunction(Clock.timeoutsMade, funcToCall, millis, true);
++    return Clock.timeoutsMade;
++}
++
++function clearTimeout(timeoutKey) {
++    Clock.scheduledFunctions[timeoutKey] = undefined;
++}
++
++function clearInterval(timeoutKey) {
++    Clock.scheduledFunctions[timeoutKey] = undefined;
++}
 === modified file 'src-js/lazrjs/testing/mockio.js'
 --- src-js/lazrjs/testing/mockio.js	2009-08-13 12:17:44 +0000
 +++ src-js/lazrjs/testing/mockio.js	2009-10-30 17:01:14 +0000
@@ -1,6 +1,6 @@
  /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
--YUI.add('lazr.testing', function(Y) {
++YUI.add('lazr.testing.mockio', function(Y) {
  /**
   * A utility module for use in YUI unit-tests with a helper for mocking Y.io.
+  *
@@ -63,9 +63,7 @@
      };
  };
--if (Y.lazr.testing === undefined) {
--    Y.lazr.testing = {};
--}
++Y.namespace("lazr.testing");
  Y.lazr.testing.MockIo = MockIo;
  }, '0.1', {});
 === added file 'src-js/lazrjs/testing/testing.js'
 --- src-js/lazrjs/testing/testing.js	1970-01-01 00:00:00 +0000
 +++ src-js/lazrjs/testing/testing.js	2009-10-30 17:01:14 +0000
@@ -0,0 +1,123 @@
++/* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
++
++YUI.add("lazr.testing.runner", function(Y) {
++
++/**
++ * Testing utilities.
++ *
++ * @module lazr.testing
++ * @namespace lazr
++ */
++
++Runner = Y.namespace("lazr.testing.Runner");
++
++Runner.add = function(suite) {
++    if ((typeof jstestdriver === "undefined")) {
++        // If we are not running under JsTestDriver, then
++        // register the suite with Y.Test.Runner and run it.
++        Y.Test.Runner.add(suite);
++    } else {
++        // If ``jstestdriver`` is defined, that means we are
++        // running under JsTestDriver, so instead register each
++        // test case from the suite as a separate TestCase() with
++        // JsTestDriver.
++        var tests = [];
++
++        for (var idx in suite.items) {
++            var suiteName = suite.name;
++            var testCase = suite.items[idx];
++            var testCaseName = testCase.name;
++
++            var clone = {};
++            for (var prop in testCase){
++                // Clone everything that is not a test method.
++                if (prop.indexOf("test") === -1){
++                    clone[prop] = testCase[prop];
++                }
++            }
++
++            // Now for each test method, create a JsTestDriver
++            // TestCase that wraps a single YUI TestSuite, that wraps
++            // a clone of the original TestCase but with only the
++            // single test method that we are interested in.
++            for (var prop in testCase){
++                if (prop.indexOf("test") === 0 &&
++                    Y.Lang.isFunction(testCase[prop])){
++                    tests.push({"suiteName": suiteName,
++                                "caseName": testCaseName,
++                                "case": clone,
++                                "methodName": prop,
++                                "method": testCase[prop]});
++                }
++            }
++        }
++
++        for (var i=0; i<tests.length; i++){
++            testObject = tests[i];
++
++            var fakeTestCase = {
++                "setUp": Y.bind(function(testObject){
++                    var testSuite = new Y.Test.Suite(testObject["suiteName"]);
++                    var testCase = new Y.Test.Case(testObject["case"]);
++                    testCase[testObject["methodName"]] = testObject["method"];
++                    testSuite.add(testCase);
++                    Y.Test.Runner.clear();
++                    Y.Test.Runner.add(testSuite);
++                }, this, testObject),
++                "tearDown": function(){
++                    Y.Test.Runner.clear();
++                },
++            };
++
++            fakeTestCase[testObject["methodName"]] = Y.bind(function (testObject) {
++                var results = [];
++
++                var onComplete = function (caseName, methodName, results, e) {
++                    Y.Test.Runner.unsubscribe("testsuitecomplete");
++                    results.push(e.results[caseName][methodName]);
++                };
++
++                Y.Test.Runner.subscribe(
++                    "testsuitecomplete",
++                    Y.bind(onComplete, this, testObject["caseName"],
++                           testObject["methodName"], results),
++                    Y.Test.Runner);
++
++                Clock.reset();
++                Y.Test.Runner.run();
++                for (var i=0;i<100 && !results.length; i++){
++                    Clock.tick(100);
++                }
++
++                var result = results.pop();
++                if (result === undefined) {
++                    fail("Test did not finish after 100 iterations.");
++                } else {
++                    if (result["result"] == "fail"){
++                        fail(result["message"]);
++                    }
++                }
++
++            }, this, testObject);
++
++            TestCase(testObject["caseName"] + "." + testObject["methodName"],
++                     fakeTestCase);
++        }
++    }
++};
++
++Runner.run = function(suite) {
++    Y.on("domready", function() {
++        if ((typeof jstestdriver === "undefined")) {
++            // If we are not running under JsTestDriver, then run all
++            // the registered test suites with Y.Test.Runner.
++            var yconsole = new Y.Console({
++                newestOnTop: false
++            });
++            yconsole.render("#log");
++            Y.Test.Runner.run();
++        }
++    });
++};
++
++}, "0.1", {requires: ["oop", "test", "console"]});
 === added file 'src-js/lazrjs/testing/yui-patch.js'
 --- src-js/lazrjs/testing/yui-patch.js	1970-01-01 00:00:00 +0000
 +++ src-js/lazrjs/testing/yui-patch.js	2009-10-30 17:01:14 +0000
@@ -0,0 +1,2137 @@
++/*
++Copyright (c) 2009, Yahoo! Inc. All rights reserved.
++Code licensed under the BSD License:
++http://developer.yahoo.net/yui/license.txt
++version: 3.0.0
++build: 1549
++*/
++
++/*
++Copied from yui/loader/loader.js
++
++Patched by the JsTestDriver team to avoid trying to load files, since
++JsTestDriver itself will load the files for you.
++*/
++
++YUI.add('loader', function(Y) {
++
++(function() {
++/**
++ * Loader dynamically loads script and css files.  It includes the dependency
++ * info for the version of the library in use, and will automatically pull in
++ * dependencies for the modules requested.  It supports rollup files and will
++ * automatically use these when appropriate in order to minimize the number of
++ * http connections required to load all of the dependencies.  It can load the
++ * files from the Yahoo! CDN, and it can utilize the combo service provided on
++ * this network to reduce the number of http connections required to download
++ * YUI files.
++ *
++ * @module loader
++ */
++
++/**
++ * Loader dynamically loads script and css files.  It includes the dependency
++ * info for the version of the library in use, and will automatically pull in
++ * dependencies for the modules requested.  It supports rollup files and will
++ * automatically use these when appropriate in order to minimize the number of
++ * http connections required to load all of the dependencies.  It can load the
++ * files from the Yahoo! CDN, and it can utilize the combo service provided on
++ * this network to reduce the number of http connections required to download
++ * YUI files.
++ *
++ * While the loader can be instantiated by the end user, it normally is not.
++ * @see YUI.use for the normal use case.  The use function automatically will
++ * pull in missing dependencies.
++ *
++ * @class Loader
++ * @constructor
++ * @param o an optional set of configuration options.  Valid options:
++ * <ul>
++ *  <li>base:
++ *  The base dir</li>
++ *  <li>secureBase:
++ *  The secure base dir (not implemented)</li>
++ *  <li>comboBase:
++ *  The YUI combo service base dir. Ex: http://yui.yahooapis.com/combo?</li>
++ *  <li>root:
++ *  The root path to prepend to module names for the combo service. Ex: 2.5.2/build/</li>
++ *  <li>filter:
++ *
++ * A filter to apply to result urls.  This filter will modify the default
++ * path for all modules.  The default path for the YUI library is the
++ * minified version of the files (e.g., event-min.js).  The filter property
++ * can be a predefined filter or a custom filter.  The valid predefined
++ * filters are:
++ * <dl>
++ *  <dt>DEBUG</dt>
++ *  <dd>Selects the debug versions of the library (e.g., event-debug.js).
++ *      This option will automatically include the Logger widget</dd>
++ *  <dt>RAW</dt>
++ *  <dd>Selects the non-minified version of the library (e.g., event.js).</dd>
++ * </dl>
++ * You can also define a custom filter, which must be an object literal
++ * containing a search expression and a replace string:
++ * <pre>
++ *  myFilter: &#123;
++ *      'searchExp': "-min\\.js",
++ *      'replaceStr': "-debug.js"
++ *  &#125;
++ * </pre>
++ *
++ *  </li>
++ *  <li>filters: per-component filter specification.  If specified for a given component, this overrides the filter config</li>
++ *  <li>combine:
++ *  Use the YUI combo service to reduce the number of http connections required to load your dependencies</li>
++ *  <li>ignore:
++ *  A list of modules that should never be dynamically loaded</li>
++ *  <li>force:
++ *  A list of modules that should always be loaded when required, even if already present on the page</li>
++ *  <li>insertBefore:
++ *  Node or id for a node that should be used as the insertion point for new nodes</li>
++ *  <li>charset:
++ *  charset for dynamic nodes (deprecated, use jsAttributes or cssAttributes)</li>
++ *  <li>jsAttributes: object literal containing attributes to add to script nodes</li>
++ *  <li>cssAttributes: object literal containing attributes to add to link nodes</li>
++ *  <li>timeout:
++ *  number of milliseconds before a timeout occurs when dynamically loading nodes.  in not set, there is no timeout</li>
++ *  <li>context:
++ *  execution context for all callbacks</li>
++ *  <li>onSuccess:
++ *  callback for the 'success' event</li>
++ *  <li>onFailure: callback for the 'failure' event</li>
++ *  <li>onCSS: callback for the 'CSSComplete' event.  When loading YUI components with CSS
++ *  the CSS is loaded first, then the script.  This provides a moment you can tie into to improve
++ *  the presentation of the page while the script is loading.</li>
++ *  <li>onTimeout:
++ *  callback for the 'timeout' event</li>
++ *  <li>onProgress:
++ *  callback executed each time a script or css file is loaded</li>
++ *  <li>modules:
++ *  A list of module definitions.  See Loader.addModule for the supported module metadata</li>
++ * </ul>
++ */
++
++/*
++ * Global loader queue
++ * @property _loaderQueue
++ * @type Queue
++ * @private
++ */
++YUI.Env._loaderQueue = YUI.Env._loaderQueue || new Y.Queue();
++
++var NOT_FOUND = {},
++    GLOBAL_ENV = YUI.Env,
++    GLOBAL_LOADED,
++    BASE = 'base',
++    CSS = 'css',
++    JS = 'js',
++    CSSRESET = 'cssreset',
++    CSSFONTS = 'cssfonts',
++    CSSGRIDS = 'cssgrids',
++    CSSBASE  = 'cssbase',
++    CSS_AFTER = [CSSRESET, CSSFONTS, CSSGRIDS,
++                 'cssreset-context', 'cssfonts-context', 'cssgrids-context'],
++    YUI_CSS = ['reset', 'fonts', 'grids', BASE],
++    VERSION = Y.version,
++    ROOT = VERSION + '/build/',
++    CONTEXT = '-context',
++
++    ANIMBASE = 'anim-base',
++	ATTRIBUTE = 'attribute',
++    ATTRIBUTEBASE = ATTRIBUTE + '-base',
++    BASEBASE = 'base-base',
++    DDDRAG = 'dd-drag',
++    DOM = 'dom',
++    DATASCHEMABASE = 'dataschema-base',
++    DATASOURCELOCAL = 'datasource-local',
++    DOMBASE = 'dom-base',
++    DOMSTYLE = 'dom-style',
++    DOMSCREEN = 'dom-screen',
++    DUMP = 'dump',
++    GET = 'get',
++    EVENTBASE = 'event-base',
++    EVENTCUSTOM = 'event-custom',
++    EVENTCUSTOMBASE = 'event-custom-base',
++    IOBASE = 'io-base',
++    NODE = 'node',
++    NODEBASE = 'node-base',
++    NODESTYLE = 'node-style',
++    NODESCREEN = 'node-screen',
++    OOP = 'oop',
++    PLUGINHOST = 'pluginhost',
++    SELECTORCSS2 = 'selector-css2',
++    SUBSTITUTE = 'substitute',
++    WIDGET = 'widget',
++    WIDGETPOSITION = 'widget-position',
++    YUIBASE = 'yui-base',
++
++	PLUGIN = 'plugin',
++
++    META = {
++
++    version: VERSION,
++
++    root: ROOT,
++
++    base: 'http://yui.yahooapis.com/' + ROOT,
++
++    comboBase: 'http://yui.yahooapis.com/combo?',
++
++    skin: {
++        defaultSkin: 'sam',
++        base: 'assets/skins/',
++        path: 'skin.css',
++        after: CSS_AFTER
++        //rollup: 3
++    },
++
++    modules: {
++
++       dom: {
++            requires: [OOP],
++            submodules: {
++
++                'dom-base': {
++                    requires: [OOP]
++                },
++
++                'dom-style': {
++                    requires: [DOMBASE]
++                },
++
++                'dom-screen': {
++                    requires: [DOMBASE, DOMSTYLE]
++                },
++
++                'selector-native': {
++                    requires: [DOMBASE]
++                },
++
++                'selector-css2': {
++                    requires: ['selector-native']
++                },
++
++                'selector': {
++                    requires: [DOMBASE]
++                }
++
++            },
++
++            plugins: {
++                'selector-css3': {
++                    requires: [SELECTORCSS2]
++                }
++            }
++        },
++
++        node: {
++            requires: [DOM, EVENTBASE],
++            // expound: EVENT,
++
++            submodules: {
++                'node-base': {
++                    requires: [DOMBASE, SELECTORCSS2, EVENTBASE]
++                },
++
++                'node-style': {
++                    requires: [DOMSTYLE, NODEBASE]
++                },
++
++                'node-screen': {
++                    requires: [DOMSCREEN, NODEBASE]
++                },
++
++                'node-pluginhost': {
++                    requires: [NODEBASE, PLUGINHOST]
++                },
++
++
++                'node-event-delegate': {
++                    requires: [NODEBASE, 'event-delegate']
++                }
++            },
++
++            plugins: {
++                'node-event-simulate': {
++                    requires: [NODEBASE, 'event-simulate']
++                }
++            }
++        },
++
++        anim: {
++            submodules: {
++
++                'anim-base': {
++                    requires: [BASEBASE, NODESTYLE]
++                },
++
++                'anim-color': {
++                    requires: [ANIMBASE]
++                },
++
++                'anim-easing': {
++                    requires: [ANIMBASE]
++                },
++
++                'anim-scroll': {
++                    requires: [ANIMBASE]
++                },
++
++                'anim-xy': {
++                    requires: [ANIMBASE, NODESCREEN]
++                },
++
++                'anim-curve': {
++                    requires: ['anim-xy']
++                },
++
++                'anim-node-plugin': {
++                     requires: ['node-pluginhost', ANIMBASE]
++                }
++            }
++        },
++
++        attribute: {
++            submodules: {
++                'attribute-base': {
++                    requires: [EVENTCUSTOM]
++                },
++
++                'attribute-complex': {
++                    requires: [ATTRIBUTEBASE]
++                }
++            }
++        },
++
++        base: {
++            submodules: {
++                'base-base': {
++                    requires: [ATTRIBUTEBASE]
++                },
++
++                'base-build': {
++                    requires: [BASEBASE]
++                },
++
++                'base-pluginhost': {
++                    requires: [BASEBASE, PLUGINHOST]
++                }
++            }
++        },
++
++        cache: {
++            requires: [PLUGIN]
++        },
++
++        compat: {
++            requires: [NODE, DUMP, SUBSTITUTE]
++        },
++
++        classnamemanager: {
++            requires: [YUIBASE]
++        },
++
++        collection: {
++            requires: [OOP]
++        },
++
++        console: {
++            requires: ['yui-log', WIDGET, SUBSTITUTE],
++            skinnable: true,
++            plugins: {
++                'console-filters': {
++                    requires: [PLUGIN, 'console'],
++                    skinnable: true
++                }
++            }
++        },
++
++        cookie: {
++            requires: [YUIBASE]
++        },
++
++        dataschema:{
++            submodules: {
++                'dataschema-base': {
++                    requires: [BASE]
++                },
++                'dataschema-array': {
++                    requires: [DATASCHEMABASE]
++                },
++                'dataschema-json': {
++                    requires: [DATASCHEMABASE, 'json']
++                },
++                'dataschema-text': {
++                    requires: [DATASCHEMABASE]
++                },
++                'dataschema-xml': {
++                    requires: [DATASCHEMABASE]
++                }
++            }
++        },
++
++        datasource:{
++            submodules: {
++                'datasource-local': {
++                    requires: [BASE]
++                },
++                'datasource-arrayschema': {
++                    requires: [DATASOURCELOCAL, PLUGIN, 'dataschema-array']
++                },
++                'datasource-cache': {
++                    requires: [DATASOURCELOCAL, 'cache']
++                },
++                'datasource-function': {
++                    requires: [DATASOURCELOCAL]
++                },
++                'datasource-jsonschema': {
++                    requires: [DATASOURCELOCAL, PLUGIN, 'dataschema-json']
++                },
++                'datasource-polling': {
++                    requires: [DATASOURCELOCAL]
++                },
++                'datasource-get': {
++                    requires: [DATASOURCELOCAL, GET]
++                },
++                'datasource-textschema': {
++                    requires: [DATASOURCELOCAL, PLUGIN, 'dataschema-text']
++                },
++                'datasource-io': {
++                    requires: [DATASOURCELOCAL, IOBASE]
++                },
++                'datasource-xmlschema': {
++                    requires: [DATASOURCELOCAL, PLUGIN, 'dataschema-xml']
++                }
++            }
++        },
++
++        datatype:{
++            submodules: {
++                'datatype-date': {
++                    requires: [YUIBASE]
++                },
++                'datatype-number': {
++                    requires: [YUIBASE]
++                },
++                'datatype-xml': {
++                    requires: [YUIBASE]
++                }
++            }
++        },
++
++        dd:{
++            submodules: {
++                'dd-ddm-base': {
++                    requires: [NODE, BASE]
++                },
++                'dd-ddm':{
++                    requires: ['dd-ddm-base', 'event-resize']
++                },
++                'dd-ddm-drop':{
++                    requires: ['dd-ddm']
++                },
++                'dd-drag':{
++                    requires: ['dd-ddm-base']
++                },
++                'dd-drop':{
++                    requires: ['dd-ddm-drop']
++                },
++                'dd-proxy':{
++                    requires: [DDDRAG]
++                },
++                'dd-constrain':{
++                    requires: [DDDRAG]
++                },
++                'dd-scroll':{
++                    requires: [DDDRAG]
++                },
++                'dd-plugin':{
++                    requires: [DDDRAG],
++                    optional: ['dd-constrain', 'dd-proxy']
++                },
++                'dd-drop-plugin':{
++                    requires: ['dd-drop']
++                }
++            }
++        },
++
++        dump: {
++            requires: [YUIBASE]
++        },
++
++        event: {
++            expound: NODEBASE,
++            submodules: {
++                'event-base': {
++                    expound: NODEBASE,
++                    requires: [EVENTCUSTOMBASE]
++                },
++                'event-delegate': {
++                    requires: [NODEBASE]
++                },
++                'event-focus': {
++                    requires: [NODEBASE]
++                },
++                'event-key': {
++                    requires: [NODEBASE]
++                },
++                'event-mouseenter': {
++                    requires: [NODEBASE]
++                },
++                'event-mousewheel': {
++                    requires: [NODEBASE]
++                },
++                'event-resize': {
++                    requires: [NODEBASE]
++                }
++            }
++        },
++
++        'event-custom': {
++            submodules: {
++                'event-custom-base': {
++                    requires: [OOP, 'yui-later']
++                },
++                'event-custom-complex': {
++                    requires: [EVENTCUSTOMBASE]
++                }
++            }
++        },
++
++        'event-simulate': {
++            requires: [EVENTBASE]
++        },
++
++        'node-focusmanager': {
++            requires: [ATTRIBUTE, NODE, PLUGIN, 'node-event-simulate', 'event-key', 'event-focus']
++        },
++
++        history: {
++            requires: [NODE]
++        },
++
++        imageloader: {
++            requires: [BASEBASE, NODESTYLE, NODESCREEN]
++        },
++
++        io:{
++            submodules: {
++
++                'io-base': {
++                    requires: [EVENTCUSTOMBASE]
++                },
++
++                'io-xdr': {
++                    requires: [IOBASE, 'datatype-xml']
++                },
++
++                'io-form': {
++                    requires: [IOBASE, NODEBASE, NODESTYLE]
++                },
++
++                'io-upload-iframe': {
++                    requires: [IOBASE, NODEBASE]
++                },
++
++                'io-queue': {
++                    requires: [IOBASE, 'queue-promote']
++                }
++            }
++        },
++
++        json: {
++            submodules: {
++                'json-parse': {
++                    requires: [YUIBASE]
++                },
++
++                'json-stringify': {
++                    requires: [YUIBASE]
++                }
++            }
++        },
++
++        loader: {
++            requires: [GET]
++        },
++
++        'node-menunav': {
++            requires: [NODE, 'classnamemanager', PLUGIN, 'node-focusmanager'],
++            skinnable: true
++        },
++
++        oop: {
++            requires: [YUIBASE]
++        },
++
++        overlay: {
++            requires: [WIDGET, WIDGETPOSITION, 'widget-position-ext', 'widget-stack', 'widget-stdmod'],
++            skinnable: true
++        },
++
++        plugin: {
++            requires: [BASEBASE]
++        },
++
++        pluginhost: {
++            requires: [YUIBASE]
++        },
++
++        profiler: {
++            requires: [YUIBASE]
++        },
++
++        'queue-promote': {
++            requires: [YUIBASE]
++        },
++
++        // deprecated package, replaced with async-queue
++        'queue-run': {
++            requires: [EVENTCUSTOM],
++            path: 'async-queue/async-queue-min.js'
++        },
++
++        'async-queue': {
++            requires: [EVENTCUSTOM],
++            supersedes: ['queue-run']
++        },
++
++        slider: {
++            requires: [WIDGET, 'dd-constrain'],
++            skinnable: true
++        },
++
++        stylesheet: {
++            requires: [YUIBASE]
++        },
++
++        substitute: {
++            optional: [DUMP]
++        },
++
++        widget: {
++            requires: [ATTRIBUTE, 'event-focus', BASE, NODE, 'classnamemanager'],
++            plugins: {
++                'widget-position': { },
++                'widget-position-ext': {
++                    requires: [WIDGETPOSITION]
++                },
++                'widget-stack': {
++                    skinnable: true
++                },
++                'widget-stdmod': { }
++            },
++            skinnable: true
++        },
++
++        yui: {
++            submodules: {
++                'yui-base': {},
++                get: {},
++                'yui-log': {},
++                'yui-later': {}
++            }
++        },
++
++        test: {
++            requires: [SUBSTITUTE, NODE, 'json', 'event-simulate']
++        }
++
++    }
++},
++
++_path = Y.cached(function(dir, file, type) {
++    return dir + '/' + file + '-min.' + (type || CSS);
++}),
++
++_queue = YUI.Env._loaderQueue,
++
++mods  = META.modules, i, bname, mname, contextname,
++L     = Y.Lang;
++
++// Create the metadata for both the regular and context-aware
++// versions of the YUI CSS foundation.
++for (i=0; i<YUI_CSS.length; i=i+1) {
++    bname = YUI_CSS[i];
++    mname = CSS + bname;
++
++    mods[mname] = {
++        type: CSS,
++        path: _path(mname, bname)
++    };
++
++    // define -context module
++    contextname = mname + CONTEXT;
++    bname = bname + CONTEXT;
++
++    mods[contextname] = {
++        type: CSS,
++        path: _path(mname, bname)
++    };
++
++    if (mname == CSSGRIDS) {
++        mods[mname].requires = [CSSFONTS];
++        mods[mname].optional = [CSSRESET];
++        mods[contextname].requires = [CSSFONTS + CONTEXT];
++        mods[contextname].optional = [CSSRESET + CONTEXT];
++    } else if (mname == CSSBASE) {
++        mods[mname].after = CSS_AFTER;
++        mods[contextname].after = CSS_AFTER;
++    }
++}
++
++Y.Env.meta = META;
++
++GLOBAL_LOADED = GLOBAL_ENV._loaded;
++
++Y.Loader = function(o) {
++
++    /**
++     * Internal callback to handle multiple internal insert() calls
++     * so that css is inserted prior to js
++     * @property _internalCallback
++     * @private
++     */
++    // this._internalCallback = null;
++
++    /**
++     * Callback that will be executed when the loader is finished
++     * with an insert
++     * @method onSuccess
++     * @type function
++     */
++    // this.onSuccess = null;
++
++    /**
++     * Callback that will be executed if there is a failure
++     * @method onFailure
++     * @type function
++     */
++    // this.onFailure = null;
++
++    /**
++     * Callback for the 'CSSComplete' event.  When loading YUI components with CSS
++     * the CSS is loaded first, then the script.  This provides a moment you can tie into to improve
++     * the presentation of the page while the script is loading.
++     * @method onCSS
++     * @type function
++     */
++    // this.onCSS = null;
++
++    /**
++     * Callback executed each time a script or css file is loaded
++     * @method onProgress
++     * @type function
++     */
++    // this.onProgress = null;
++
++    /**
++     * Callback that will be executed if a timeout occurs
++     * @method onTimeout
++     * @type function
++     */
++    // this.onTimeout = null;
++
++    /**
++     * The execution context for all callbacks
++     * @property context
++     * @default {YUI} the YUI instance
++     */
++    this.context = Y;
++
++    /**
++     * Data that is passed to all callbacks
++     * @property data
++     */
++    // this.data = null;
++
++    /**
++     * Node reference or id where new nodes should be inserted before
++     * @property insertBefore
++     * @type string|HTMLElement
++     */
++    // this.insertBefore = null;
++
++    /**
++     * The charset attribute for inserted nodes
++     * @property charset
++     * @type string
++     * @deprecated, use cssAttributes or jsAttributes
++     */
++    // this.charset = null;
++
++    /**
++     * An object literal containing attributes to add to link nodes
++     * @property cssAttributes
++     * @type object
++     */
++    // this.cssAttributes = null;
++
++    /**
++     * An object literal containing attributes to add to script nodes
++     * @property jsAttributes
++     * @type object
++     */
++    // this.jsAttributes = null;
++
++    /**
++     * The base directory.
++     * @property base
++     * @type string
++     * @default http://yui.yahooapis.com/[YUI VERSION]/build/
++     */
++    this.base = Y.Env.meta.base;
++
++    /**
++     * Base path for the combo service
++     * @property comboBase
++     * @type string
++     * @default http://yui.yahooapis.com/combo?
++     */
++    this.comboBase = Y.Env.meta.comboBase;
++
++    /**
++     * If configured, YUI JS resources will use the combo
++     * handler
++     * @property combine
++     * @type boolean
++     * @default true if a base dir isn't in the config
++     */
++    this.combine = o.base && (o.base.indexOf( this.comboBase.substr(0, 20)) > -1);
++
++    /**
++     * Ignore modules registered on the YUI global
++     * @property ignoreRegistered
++     * @default false
++     */
++    // this.ignoreRegistered = false;
++
++    /**
++     * Root path to prepend to module path for the combo
++     * service
++     * @property root
++     * @type string
++     * @default [YUI VERSION]/build/
++     */
++    this.root = Y.Env.meta.root;
++
++    /**
++     * Timeout value in milliseconds.  If set, this value will be used by
++     * the get utility.  the timeout event will fire if
++     * a timeout occurs.
++     * @property timeout
++     * @type int
++     */
++    this.timeout = 0;
++
++    /**
++     * A list of modules that should not be loaded, even if
++     * they turn up in the dependency tree
++     * @property ignore
++     * @type string[]
++     */
++    // this.ignore = null;
++
++    /**
++     * A list of modules that should always be loaded, even
++     * if they have already been inserted into the page.
++     * @property force
++     * @type string[]
++     */
++    // this.force = null;
++
++    this.forceMap = {};
++
++    /**
++     * Should we allow rollups
++     * @property allowRollup
++     * @type boolean
++     * @default true
++     */
++    // this.allowRollup = true;
++
++    /**
++     * A filter to apply to result urls.  This filter will modify the default
++     * path for all modules.  The default path for the YUI library is the
++     * minified version of the files (e.g., event-min.js).  The filter property
++     * can be a predefined filter or a custom filter.  The valid predefined
++     * filters are:
++     * <dl>
++     *  <dt>DEBUG</dt>
++     *  <dd>Selects the debug versions of the library (e.g., event-debug.js).
++     *      This option will automatically include the Logger widget</dd>
++     *  <dt>RAW</dt>
++     *  <dd>Selects the non-minified version of the library (e.g., event.js).</dd>
++     * </dl>
++     * You can also define a custom filter, which must be an object literal
++     * containing a search expression and a replace string:
++     * <pre>
++     *  myFilter: &#123;
++     *      'searchExp': "-min\\.js",
++     *      'replaceStr': "-debug.js"
++     *  &#125;
++     * </pre>
++     * @property filter
++     * @type string|{searchExp: string, replaceStr: string}
++     */
++    // this.filter = null;
++
++    /**
++     * per-component filter specification.  If specified for a given component, this
++     * overrides the filter config.
++     * @property filters
++     * @type object
++     */
++    this.filters = {};
++
++    /**
++     * The list of requested modules
++     * @property required
++     * @type {string: boolean}
++     */
++    this.required = {};
++
++    /**
++     * The library metadata
++     * @property moduleInfo
++     */
++    // this.moduleInfo = Y.merge(Y.Env.meta.moduleInfo);
++    this.moduleInfo = {};
++
++    /**
++     * Provides the information used to skin the skinnable components.
++     * The following skin definition would result in 'skin1' and 'skin2'
++     * being loaded for calendar (if calendar was requested), and
++     * 'sam' for all other skinnable components:
++     *
++     *   <code>
++     *   skin: {
++     *
++     *      // The default skin, which is automatically applied if not
++     *      // overriden by a component-specific skin definition.
++     *      // Change this in to apply a different skin globally
++     *      defaultSkin: 'sam',
++     *
++     *      // This is combined with the loader base property to get
++     *      // the default root directory for a skin. ex:
++     *      // http://yui.yahooapis.com/2.3.0/build/assets/skins/sam/
++     *      base: 'assets/skins/',
++     *
++     *      // The name of the rollup css file for the skin
++     *      path: 'skin.css',
++     *
++     *      // The number of skinnable components requested that are
++     *      // required before using the rollup file rather than the
++     *      // individual component css files
++     *      rollup: 3,
++     *
++     *      // Any component-specific overrides can be specified here,
++     *      // making it possible to load different skins for different
++     *      // components.  It is possible to load more than one skin
++     *      // for a given component as well.
++     *      overrides: {
++     *          calendar: ['skin1', 'skin2']
++     *      }
++     *   }
++     *   </code>
++     *   @property skin
++     */
++     this.skin = Y.merge(Y.Env.meta.skin);
++
++    var defaults = Y.Env.meta.modules, i, onPage = YUI.Env.mods;
++
++    this._internal = true;
++    for (i in defaults) {
++        if (defaults.hasOwnProperty(i)) {
++            this.addModule(defaults[i], i);
++        }
++    }
++
++    for (i in onPage) {
++        if (onPage.hasOwnProperty(i) && !this.moduleInfo[i] && onPage[i].details) {
++            this.addModule(onPage[i].details, i);
++        }
++    }
++    this._internal = false;
++
++    /**
++     * List of rollup files found in the library metadata
++     * @property rollups
++     */
++    // this.rollups = null;
++
++    /**
++     * Whether or not to load optional dependencies for
++     * the requested modules
++     * @property loadOptional
++     * @type boolean
++     * @default false
++     */
++    // this.loadOptional = false;
++
++    /**
++     * All of the derived dependencies in sorted order, which
++     * will be populated when either calculate() or insert()
++     * is called
++     * @property sorted
++     * @type string[]
++     */
++    this.sorted = [];
++
++    /**
++     * Set when beginning to compute the dependency tree.
++     * Composed of what YUI reports to be loaded combined
++     * with what has been loaded by any instance on the page
++     * with the version number specified in the metadata.
++     * @propery loaded
++     * @type {string: boolean}
++     */
++    this.loaded = GLOBAL_LOADED[VERSION];
++
++    /**
++     * A list of modules to attach to the YUI instance when complete.
++     * If not supplied, the sorted list of dependencies are applied.
++     * @property attaching
++     */
++    // this.attaching = null;
++
++    /**
++     * Flag to indicate the dependency tree needs to be recomputed
++     * if insert is called again.
++     * @property dirty
++     * @type boolean
++     * @default true
++     */
++    this.dirty = true;
++
++    /**
++     * List of modules inserted by the utility
++     * @property inserted
++     * @type {string: boolean}
++     */
++    this.inserted = {};
++
++    /**
++     * List of skipped modules during insert() because the module
++     * was not defined
++     * @property skipped
++     */
++    this.skipped = {};
++
++
++    // Y.on('yui:load', this.loadNext, this);
++
++    this._config(o);
++
++};
++
++Y.Loader.prototype = {
++
++    FILTER_DEFS: {
++        RAW: {
++            'searchExp': "-min\\.js",
++            'replaceStr': ".js"
++        },
++        DEBUG: {
++            'searchExp': "-min\\.js",
++            'replaceStr': "-debug.js"
++        }
++    },
++
++    SKIN_PREFIX: "skin-",
++
++    _config: function(o) {
++
++        var i, j, val, f;
++
++        // apply config values
++        if (o) {
++            for (i in o) {
++                if (o.hasOwnProperty(i)) {
++                    val = o[i];
++                    if (i == 'require') {
++                        this.require(val);
++                    } else if (i == 'modules') {
++
++                        // add a hash of module definitions
++                        for (j in val) {
++                            if (val.hasOwnProperty(j)) {
++                                this.addModule(val[j], j);
++                            }
++                        }
++
++                    } else {
++                        this[i] = val;
++                    }
++                }
++            }
++        }
++
++        // fix filter
++        f = this.filter;
++
++        if (L.isString(f)) {
++            f = f.toUpperCase();
++            this.filterName = f;
++            this.filter = this.FILTER_DEFS[f];
++            if (f == 'DEBUG') {
++                this.require('yui-log', 'dump');
++            }
++        }
++
++    },
++
++    /**
++     * Returns the skin module name for the specified skin name.  If a
++     * module name is supplied, the returned skin module name is
++     * specific to the module passed in.
++     * @method formatSkin
++     * @param skin {string} the name of the skin
++     * @param mod {string} optional: the name of a module to skin
++     * @return {string} the full skin module name
++     */
++    formatSkin: function(skin, mod) {
++        var s = this.SKIN_PREFIX + skin;
++        if (mod) {
++            s = s + "-" + mod;
++        }
++
++        return s;
++    },
++
++    /*
++     * Reverses <code>formatSkin</code>, providing the skin name and
++     * module name if the string matches the pattern for skins.
++     * @method parseSkin
++     * @param mod {string} the module name to parse
++     * @return {skin: string, module: string} the parsed skin name
++     * and module name, or null if the supplied string does not match
++     * the skin pattern
++     *
++     * This isn't being used at the moment
++     *
++     */
++    // parseSkin: function(mod) {
++    //
++    //     if (mod.indexOf(this.SKIN_PREFIX) === 0) {
++    //         var a = mod.split("-");
++    //         return {skin: a[1], module: a[2]};
++    //     }
++    //     return null;
++    // },
++
++    /**
++     * Adds the skin def to the module info
++     * @method _addSkin
++     * @param skin {string} the name of the skin
++     * @param mod {string} the name of the module
++     * @param parent {string} parent module if this is a skin of a
++     * submodule or plugin
++     * @return {string} the module name for the skin
++     * @private
++     */
++    _addSkin: function(skin, mod, parent) {
++
++        var name = this.formatSkin(skin),
++            info = this.moduleInfo,
++            sinf = this.skin,
++            ext  = info[mod] && info[mod].ext,
++            mdef, pkg;
++
++        /*
++        // Add a module definition for the skin rollup css
++        if (!info[name]) {
++            this.addModule({
++                'name': name,
++                'type': 'css',
++                'path': sinf.base + skin + '/' + sinf.path,
++                //'supersedes': '*',
++                'after': sinf.after,
++                'rollup': sinf.rollup,
++                'ext': ext
++            });
++        }
++        */
++
++        // Add a module definition for the module-specific skin css
++        if (mod) {
++            name = this.formatSkin(skin, mod);
++            if (!info[name]) {
++                mdef = info[mod];
++                pkg = mdef.pkg || mod;
++                this.addModule({
++                    'name': name,
++                    'type': 'css',
++                    'after': sinf.after,
++                    'path': (parent || pkg) + '/' + sinf.base + skin + '/' + mod + '.css',
++                    'ext': ext
++                });
++            }
++        }
++
++        return name;
++    },
++
++    /** Add a new module to the component metadata.
++     * <dl>
++     *     <dt>name:</dt>       <dd>required, the component name</dd>
++     *     <dt>type:</dt>       <dd>required, the component type (js or css)</dd>
++     *     <dt>path:</dt>       <dd>required, the path to the script from "base"</dd>
++     *     <dt>requires:</dt>   <dd>array of modules required by this component</dd>
++     *     <dt>optional:</dt>   <dd>array of optional modules for this component</dd>
++     *     <dt>supersedes:</dt> <dd>array of the modules this component replaces</dd>
++     *     <dt>after:</dt>      <dd>array of modules the components which, if present, should be sorted above this one</dd>
++     *     <dt>rollup:</dt>     <dd>the number of superseded modules required for automatic rollup</dd>
++     *     <dt>fullpath:</dt>   <dd>If fullpath is specified, this is used instead of the configured base + path</dd>
++     *     <dt>skinnable:</dt>  <dd>flag to determine if skin assets should automatically be pulled in</dd>
++     *     <dt>submodules:</dt> <dd>a has of submodules</dd>
++     * </dl>
++     * @method addModule
++     * @param o An object containing the module data
++     * @param name the module name (optional), required if not in the module data
++     * @return {boolean} true if the module was added, false if
++     * the object passed in did not provide all required attributes
++     */
++    addModule: function(o, name) {
++
++        name = name || o.name;
++        o.name = name;
++
++        if (!o || !o.name) {
++            return false;
++        }
++
++        if (!o.type) {
++            o.type = JS;
++        }
++
++        if (!o.path && !o.fullpath) {
++            // o.path = name + "/" + name + "-min." + o.type;
++            o.path = _path(name, name, o.type);
++        }
++
++        o.ext = ('ext' in o) ? o.ext : (this._internal) ? false : true;
++        o.requires = o.requires || [];
++
++
++        this.moduleInfo[name] = o;
++
++        // Handle submodule logic
++        var subs = o.submodules, i, l, sup, s, smod, plugins, plug;
++        if (subs) {
++            sup = [];
++            l   = 0;
++
++            for (i in subs) {
++                if (subs.hasOwnProperty(i)) {
++                    s = subs[i];
++                    s.path = _path(name, i, o.type);
++                    this.addModule(s, i);
++                    sup.push(i);
++
++                    if (o.skinnable) {
++                        smod = this._addSkin(this.skin.defaultSkin, i, name);
++                        sup.push(smod.name);
++                    }
++
++                    l++;
++                }
++            }
++
++            o.supersedes = sup;
++            o.rollup = (l<4) ? l : Math.min(l-1, 4);
++        }
++
++        plugins = o.plugins;
++        if (plugins) {
++            for (i in plugins) {
++                if (plugins.hasOwnProperty(i)) {
++                    plug = plugins[i];
++                    plug.path = _path(name, i, o.type);
++                    plug.requires = plug.requires || [];
++                    // plug.requires.push(name);
++                    this.addModule(plug, i);
++                    if (o.skinnable) {
++                        this._addSkin(this.skin.defaultSkin, i, name);
++                    }
++                }
++            }
++        }
++
++        this.dirty = true;
++
++        return o;
++    },
++
++    /**
++     * Add a requirement for one or more module
++     * @method require
++     * @param what {string[] | string*} the modules to load
++     */
++    require: function(what) {
++        var a = (typeof what === "string") ? arguments : what;
++        this.dirty = true;
++        Y.mix(this.required, Y.Array.hash(a));
++    },
++
++    /**
++     * Returns an object containing properties for all modules required
++     * in order to load the requested module
++     * @method getRequires
++     * @param mod The module definition from moduleInfo
++     */
++    getRequires: function(mod) {
++
++        if (!mod) {
++            return [];
++        }
++
++        if (!this.dirty && mod.expanded) {
++            return mod.expanded;
++        }
++
++        var i, d=[], r=mod.requires, o=mod.optional,
++            info=this.moduleInfo, m, j, add;
++
++        for (i=0; i<r.length; i=i+1) {
++            d.push(r[i]);
++            m = this.getModule(r[i]);
++            add = this.getRequires(m);
++            for (j=0;j<add.length;j=j+1) {
++                d.push(add[j]);
++            }
++        }
++
++        // get the requirements from superseded modules, if any
++        r=mod.supersedes;
++        if (r) {
++            for (i=0; i<r.length; i=i+1) {
++                d.push(r[i]);
++                m = this.getModule(r[i]);
++                add = this.getRequires(m);
++                for (j=0;j<add.length;j=j+1) {
++                    d.push(add[j]);
++                }
++            }
++        }
++
++        if (o && this.loadOptional) {
++            for (i=0; i<o.length; i=i+1) {
++                d.push(o[i]);
++                add = this.getRequires(info[o[i]]);
++                for (j=0;j<add.length;j=j+1) {
++                    d.push(add[j]);
++                }
++            }
++        }
++
++        mod.expanded = Y.Object.keys(Y.Array.hash(d));
++        return mod.expanded;
++    },
++
++
++    /**
++     * Returns a hash of module names the supplied module satisfies.
++     * @method getProvides
++     * @param name {string} The name of the module
++     * @return what this module provides
++     */
++    getProvides: function(name) {
++        var m = this.getModule(name), o, s;
++
++        if (!m) {
++            return NOT_FOUND;
++        }
++
++        if (m && !m.provides) {
++            o = {};
++            s = m.supersedes;
++
++            if (s) {
++                Y.Array.each(s, function(v) {
++                    Y.mix(o, this.getProvides(v));
++                }, this);
++            }
++
++            o[name] = true;
++            m.provides = o;
++        }
++
++        return m.provides;
++    },
++
++
++    /**
++     * Calculates the dependency tree, the result is stored in the sorted
++     * property
++     * @method calculate
++     * @param o optional options object
++     * @param type optional argument to prune modules
++     */
++    calculate: function(o, type) {
++        if (o || type || this.dirty) {
++            this._config(o);
++            this._setup();
++            this._explode();
++            if (this.allowRollup && !this.combine) {
++                this._rollup();
++            }
++            this._reduce();
++            this._sort();
++
++
++            this.dirty = false;
++        }
++    },
++
++    /**
++     * Investigates the current YUI configuration on the page.  By default,
++     * modules already detected will not be loaded again unless a force
++     * option is encountered.  Called by calculate()
++     * @method _setup
++     * @private
++     */
++    _setup: function() {
++
++        var info = this.moduleInfo, name, i, j, m, o, l, smod;
++
++        // Create skin modules
++        for (name in info) {
++            if (info.hasOwnProperty(name)) {
++                m = info[name];
++                if (m && m.skinnable) {
++                    o = this.skin.overrides;
++                    if (o && o[name]) {
++                        for (i=0; i<o[name].length; i=i+1) {
++                            smod = this._addSkin(o[name][i], name);
++                        }
++                    } else {
++                        smod = this._addSkin(this.skin.defaultSkin, name);
++                    }
++
++                    m.requires.push(smod);
++                }
++            }
++        }
++
++        l = Y.merge(this.inserted); // shallow clone
++
++        // available modules
++        if (!this.ignoreRegistered) {
++            Y.mix(l, GLOBAL_ENV.mods);
++        }
++
++
++        // add the ignore list to the list of loaded packages
++        if (this.ignore) {
++            // OU.appendArray(l, this.ignore);
++            Y.mix(l, Y.Array.hash(this.ignore));
++        }
++
++        // expand the list to include superseded modules
++        for (j in l) {
++            if (l.hasOwnProperty(j)) {
++                Y.mix(l, this.getProvides(j));
++            }
++        }
++
++        // remove modules on the force list from the loaded list
++        if (this.force) {
++            for (i=0; i<this.force.length; i=i+1) {
++                if (this.force[i] in l) {
++                    delete l[this.force[i]];
++                }
++            }
++        }
++
++
++        Y.mix(this.loaded, l);
++
++        // this.loaded = l;
++
++    },
++
++
++    /**
++     * Inspects the required modules list looking for additional
++     * dependencies.  Expands the required list to include all
++     * required modules.  Called by calculate()
++     * @method _explode
++     * @private
++     */
++    _explode: function() {
++
++        var r = this.required, m, reqs;
++
++        Y.Object.each(r, function(v, name) {
++
++            m = this.getModule(name);
++
++            var expound = m && m.expound;
++
++            if (m) {
++
++                if (expound) {
++                    r[expound] = this.getModule(expound);
++                    reqs = this.getRequires(r[expound]);
++                    Y.mix(r, Y.Array.hash(reqs));
++                }
++
++                reqs = this.getRequires(m);
++
++                Y.mix(r, Y.Array.hash(reqs));
++            }
++
++        }, this);
++    },
++
++    getModule: function(name) {
++
++        var m = this.moduleInfo[name];
++
++        // create the default module
++        // if (!m) {
++            // m = this.addModule({ext: false}, name);
++        // }
++
++        return m;
++    },
++
++    /**
++     * Look for rollup packages to determine if all of the modules a
++     * rollup supersedes are required.  If so, include the rollup to
++     * help reduce the total number of connections required.  Called
++     * by calculate()
++     * @method _rollup
++     * @private
++     */
++    _rollup: function() {
++        var i, j, m, s, rollups={}, r=this.required, roll,
++            info = this.moduleInfo, rolled, c;
++
++        // find and cache rollup modules
++        if (this.dirty || !this.rollups) {
++            for (i in info) {
++                if (info.hasOwnProperty(i)) {
++                    m = this.getModule(i);
++                    // if (m && m.rollup && m.supersedes) {
++                    if (m && m.rollup) {
++                        rollups[i] = m;
++                    }
++                }
++            }
++
++            this.rollups = rollups;
++            this.forceMap = (this.force) ? Y.Array.hash(this.force) : {};
++        }
++
++        // make as many passes as needed to pick up rollup rollups
++        for (;;) {
++            rolled = false;
++
++            // go through the rollup candidates
++            for (i in rollups) {
++
++                if (rollups.hasOwnProperty(i)) {
++
++                    // there can be only one, unless forced
++                    if (!r[i] && ((!this.loaded[i]) || this.forceMap[i])) {
++                        m = this.getModule(i);
++                        s = m.supersedes || [];
++                        roll = false;
++
++                        // @TODO remove continue
++                        if (!m.rollup) {
++                            continue;
++                        }
++
++                        c = 0;
++
++                        // check the threshold
++                        for (j=0;j<s.length;j=j+1) {
++
++
++                            // if the superseded module is loaded, we can't load the rollup
++                            // unless it has been forced
++                            if (this.loaded[s[j]] && !this.forceMap[s[j]]) {
++                                roll = false;
++                                break;
++                            // increment the counter if this module is required.  if we are
++                            // beyond the rollup threshold, we will use the rollup module
++                            } else if (r[s[j]]) {
++                                c++;
++                                roll = (c >= m.rollup);
++                                if (roll) {
++                                    break;
++                                }
++                            }
++                        }
++
++                        if (roll) {
++                            // add the rollup
++                            r[i] = true;
++                            rolled = true;
++
++                            // expand the rollup's dependencies
++                            this.getRequires(m);
++                        }
++                    }
++                }
++            }
++
++            // if we made it here w/o rolling up something, we are done
++            if (!rolled) {
++                break;
++            }
++        }
++    },
++
++    /**
++     * Remove superceded modules and loaded modules.  Called by
++     * calculate() after we have the mega list of all dependencies
++     * @method _reduce
++     * @private
++     */
++    _reduce: function() {
++        var i, j, s, m, r=this.required, type = this.loadType;
++        for (i in r) {
++            if (r.hasOwnProperty(i)) {
++                m = this.getModule(i);
++                // remove if already loaded
++                if ((this.loaded[i] && (!this.forceMap[i]) && !this.ignoreRegistered) || (type && m && m.type != type)) {
++                    delete r[i];
++                // remove anything this module supersedes
++                } else {
++
++                    s = m && m.supersedes;
++                    if (s) {
++                        for (j=0; j<s.length; j=j+1) {
++                            if (s[j] in r) {
++                                delete r[s[j]];
++                            }
++                        }
++                    }
++                }
++            }
++        }
++    },
++
++    _attach: function() {
++        // this is the full list of items the YUI needs attached,
++        // which is needed if some dependencies are already on
++        // the page without their dependencies.
++        if (this.attaching) {
++            Y._attach(this.attaching);
++        } else {
++            Y._attach(this.sorted);
++        }
++
++        // this._pushEvents();
++
++    },
++
++    _finish: function() {
++        _queue.running = false;
++        this._continue();
++    },
++
++    _onSuccess: function() {
++
++
++        this._attach();
++
++        var skipped = this.skipped, i, f;
++
++        for (i in skipped) {
++            if (skipped.hasOwnProperty(i)) {
++                delete this.inserted[i];
++            }
++        }
++
++        this.skipped = {};
++
++        f = this.onSuccess;
++
++        if (f) {
++            f.call(this.context, {
++                msg: 'success',
++                data: this.data,
++                success: true
++            });
++        }
++
++        this._finish();
++
++    },
++
++    _onFailure: function(o) {
++
++
++        this._attach();
++
++        var f = this.onFailure;
++        if (f) {
++            f.call(this.context, {
++                msg: 'failure: ' + o.msg,
++                data: this.data,
++                success: false
++            });
++        }
++
++        this._finish();
++    },
++
++    _onTimeout: function() {
++
++
++        this._attach();
++
++        var f = this.onTimeout;
++        if (f) {
++            f.call(this.context, {
++                msg: 'timeout',
++                data: this.data,
++                success: false
++            });
++        }
++
++        this._finish();
++    },
++
++    /**
++     * Sorts the dependency tree.  The last step of calculate()
++     * @method _sort
++     * @private
++     */
++    _sort: function() {
++
++        // create an indexed list
++        var s = Y.Object.keys(this.required),
++            info = this.moduleInfo,
++            loaded = this.loaded,
++            done = {},
++            p=0, l, a, b, j, k, moved, doneKey,
++
++        // returns true if b is not loaded, and is required
++        // directly or by means of modules it supersedes.
++            requires = Y.cached(function(mod1, mod2) {
++
++                var m = info[mod1], i, r, after, other = info[mod2], s;
++
++                if (loaded[mod2] || !m || !other) {
++                    return false;
++                }
++
++                r     = m.expanded;
++                after = m.after;
++
++                // check if this module requires the other directly
++                if (r && Y.Array.indexOf(r, mod2) > -1) {
++                    return true;
++                }
++
++                // check if this module should be sorted after the other
++                if (after && Y.Array.indexOf(after, mod2) > -1) {
++                    return true;
++                }
++
++                // check if this module requires one the other supersedes
++                s = info[mod2] && info[mod2].supersedes;
++                if (s) {
++                    for (i=0; i<s.length; i=i+1) {
++                        if (requires(mod1, s[i])) {
++                            return true;
++                        }
++                    }
++                }
++
++                // external css files should be sorted below yui css
++                if (m.ext && m.type == CSS && !other.ext && other.type == CSS) {
++                    return true;
++                }
++
++                return false;
++            });
++
++        // keep going until we make a pass without moving anything
++        for (;;) {
++
++            l     = s.length;
++            moved = false;
++
++            // start the loop after items that are already sorted
++            for (j=p; j<l; j=j+1) {
++
++                // check the next module on the list to see if its
++                // dependencies have been met
++                a = s[j];
++
++                // check everything below current item and move if we
++                // find a requirement for the current item
++                for (k=j+1; k<l; k=k+1) {
++                    doneKey = a + s[k];
++                    if (!done[doneKey] && requires(a, s[k])) {
++
++                        // extract the dependency so we can move it up
++                        b = s.splice(k, 1);
++
++                        // insert the dependency above the item that
++                        // requires it
++                        s.splice(j, 0, b[0]);
++
++                        // only swap two dependencies once to short circut
++                        // circular dependencies
++                        done[doneKey] = true;
++
++                        // keep working
++                        moved = true;
++
++                        break;
++                    }
++                }
++
++                // jump out of loop if we moved something
++                if (moved) {
++                    break;
++                // this item is sorted, move our pointer and keep going
++                } else {
++                    p = p + 1;
++                }
++            }
++
++            // when we make it here and moved is false, we are
++            // finished sorting
++            if (!moved) {
++                break;
++            }
++
++        }
++
++        this.sorted = s;
++    },
++
++    _insert: function(source, o, type) {
++
++
++        // restore the state at the time of the request
++        if (source) {
++            this._config(source);
++        }
++
++        // build the dependency list
++        this.calculate(o); // don't include type so we can process CSS and script in
++                           // one pass when the type is not specified.
++        this.loadType = "js";
++
++        // if (!type) {
++
++        //     var self = this;
++
++        //     this._internalCallback = function() {
++        //         var f = self.onCSS;
++        //         if (f) {
++        //             f.call(self.context, Y);
++        //         }
++        //         self._internalCallback = null;
++        //         self._insert(null, null, JS);
++        //     };
++
++        //     // _queue.running = false;
++        //     this._insert(null, null, CSS);
++
++        //     return;
++        // }
++
++
++        // set a flag to indicate the load has started
++        this._loading = true;
++
++        // flag to indicate we are done with the combo service
++        // and any additional files will need to be loaded
++        // individually
++        this._combineComplete = {};
++
++
++        // start the load
++        this.loadNext();
++
++    },
++
++    _continue: function() {
++        if (!(_queue.running) && _queue.size() > 0) {
++            _queue.running = true;
++            _queue.next()();
++        }
++    },
++
++    /**
++     * inserts the requested modules and their dependencies.
++     * <code>type</code> can be "js" or "css".  Both script and
++     * css are inserted if type is not provided.
++     * @method insert
++     * @param o optional options object
++     * @param type {string} the type of dependency to insert
++     */
++    insert: function(o, type) {

LAZR Javascript Library

Merge lp:~sidnei/lazr-js/yui-3.0.0-redux into lp:lazr-js

Commit message

Description of the change

Preview Diff

Subscribers