Merge lp:~rockstar/phazr/builder into lp:phazr

[Paul Hummer]

This branch makes changes to the layout of the library so that the javascript files are built with the YUI Builder. The Makefile even goes out to get a copy of the Builder as well.

My intention is to get the assets (css and images) sorted out with the Builder as well, and then generate a tarball with all the dependencies in it. I'll then distribute the resulting tarball.

[Martin Albisetti (beuno)]

I can't seem to get make to work:

beuno@beuno-laptop:~/canonical/builder$ make
cd src/phazroverlay; ant build
Buildfile: /home/beuno/canonical/builder/src/phazroverlay/build.xml

BUILD FAILED
/home/beuno/canonical/builder/src/phazroverlay/build.xml:6: Cannot find /home/beuno/canonical/builder/componentbuild/3.x/bootstrap.xml imported from /home/beuno/canonical/builder/src/phazroverlay/build.xml

Total time: 0 seconds
make: *** [phazr-overlay] Error 1

review: Needs Information

[Paul Hummer (rockstar)]

Ha! It's because your CWD is called "builder" and so the make target is satisfied with ../builder being present, so it doesn't go to get the YUI Builder already. Try re-naming your CWD to something other than "builder" and do `make` again.

[Martin Albisetti (beuno)]

review: Approve

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2011-08-24 22:45:23 +0000
@@ -0,0 +1,1 @@
+build/*

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2011-08-24 22:45:23 +0000
@@ -0,0 +1,20 @@
+all: phazr-overlay phazr-editable phazr-formplugin
+
+../builder:
+	cd ..; git clone git://github.com/yui/builder.git
+builder: ../builder
+
+phazr-overlay: src/phazroverlay/build.properties src/phazroverlay/js/overlay.js builder
+	cd src/phazroverlay; ant build
+
+phazr-editable: src/editableplugin/build.properties src/editableplugin/js/editable.js builder
+	cd src/editableplugin; ant build
+
+phazr-formplugin: src/formplugin/build.properties src/formplugin/js/form.js builder
+	cd src/formplugin; ant build
+
+clean:
+	rm -rf build/*
+
+dist-clean: clean
+	rm -rf ../builder

=== added directory 'build'
=== added directory 'src/editableplugin'
=== added file 'src/editableplugin/build.properties'
--- src/editableplugin/build.properties	1970-01-01 00:00:00 +0000
+++ src/editableplugin/build.properties	2011-08-24 22:45:23 +0000
@@ -0,0 +1,5 @@
+builddir=../../../builder/componentbuild
+component=phazr-editable
+component.jsfiles=editable.js
+component.requires=base-build, node, plugin
+component.builddir=../../build

=== added file 'src/editableplugin/build.xml'
--- src/editableplugin/build.xml	1970-01-01 00:00:00 +0000
+++ src/editableplugin/build.xml	2011-08-24 22:45:23 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="Editable Plugin" default="local">
+    <description>Phazr Editable Node Plugin</description>
+    <property file="build.properties" />
+    <import file="${builddir}/3.x/bootstrap.xml" description="Default Build Properties and Target" />
+</project>

=== added directory 'src/editableplugin/js'
=== renamed file 'src/js/editableplugin/editableplugin.js' => 'src/editableplugin/js/editable.js'
--- src/js/editableplugin/editableplugin.js	2011-06-05 20:51:35 +0000
+++ src/editableplugin/js/editable.js	2011-08-24 22:45:23 +0000
@@ -1,88 +1,80 @@
-YUI.add('phazr-editable', function(Y) {
-
-    Y.Editable = Y.Base.create('editable', Y.Plugin.Base, [], {
-        initializer: function(config) {
-            var host = this.get('host');
-            host.addClass('editable');
-            host.on('click', Y.bind(this.edit, this));
-        },
-        cancel: function() {
-            var editor = this.get('editor'),
-                host = this.get('host');
-            editor.hide();
-            host.show();
-        },
-        edit: function(e) {
-            e.preventDefault();
-            var host = this.get('host');
-                multiline = this.get('multiline'),
-                text = Y.Lang.trim(host.get('text')),
-                editor = this.get('editor');
-
-            if (editor === null) {
-                var parentNode = host.get('parentNode'),
-                    editor = Y.Node.create('<div></div>'),
-                    controlTemplate = multiline ? '<div></div>' : '<span></span>',
-                    controls = Y.Node.create(controlTemplate),
-                    save = Y.Node.create(this.get('saveTemplate')),
-                    cancel = Y.Node.create(this.get('cancelTemplate')),
-                    textbox = null;
-
-                if (multiline) {
-                    textbox = Y.Node.create('<textarea></textarea>');
-                } else {
-                    textbox = Y.Node.create('<input type="text" />');
-                }
-
-                save.on('click', this.save, this);
-                cancel.on('click', this.cancel, this);
-
-                controls.appendChild(save);
-                controls.appendChild(cancel);
-                editor.appendChild(textbox);
-                editor.appendChild(controls);
-                editor.hide();
-
-                textbox.on('keyup', this._handleKeyPress, this);
-                parentNode.insert(editor, host);
-                this.set('editor', editor);
-            }
-
-            editor.get('firstChild').set('value', text);
-            editor.show();
-            host.hide();
-        },
-        save: function() {
-            var editor = this.get('editor'),
-                host = this.get('host'),
-                save = this.get('saveFn'),
-                value = editor.get('firstChild').get('value');
-            if (save !== null) { save(value); }
-            host.setContent(value);
-            editor.hide();
-            host.show();
-        },
-        _handleKeyPress: function(e) {
-            if (e.keyCode) {
-                if (e.keyCode === 27) { this.cancel(); }
-                if (e.keyCode === 13 && this.get('multiline') === false) {
-                    this.save();
-                }
-            }
-        }
-    }, {
-        ATTRS: {
-            cancelTemplate: { value: '<button class="phazr-button phazr-cancel">Cancel</button>' },
-            editor: { value: null },
-            multiline: { value: false },
-            saveFn: { value: null },
-            saveTemplate: { value: '<button class="phazr-button phazr-save">Save</button>' }
-        },
-        NS: 'editable'
-    });
-
-}, '1.0', { requires: [
-    'base',
-    'node',
-    'plugin',
-]});
+Y.Editable = Y.Base.create('editable', Y.Plugin.Base, [], {
+    initializer: function(config) {
+        var host = this.get('host');
+        host.addClass('editable');
+        host.on('click', Y.bind(this.edit, this));
+    },
+    cancel: function() {
+        var editor = this.get('editor'),
+            host = this.get('host');
+        editor.hide();
+        host.show();
+    },
+    edit: function(e) {
+        e.preventDefault();
+        var host = this.get('host');
+            multiline = this.get('multiline'),
+            text = Y.Lang.trim(host.get('text')),
+            editor = this.get('editor');
+
+        if (editor === null) {
+            var parentNode = host.get('parentNode'),
+                editor = Y.Node.create('<div></div>'),
+                controlTemplate = multiline ? '<div></div>' : '<span></span>',
+                controls = Y.Node.create(controlTemplate),
+                save = Y.Node.create(this.get('saveTemplate')),
+                cancel = Y.Node.create(this.get('cancelTemplate')),
+                textbox = null;
+
+            if (multiline) {
+                textbox = Y.Node.create('<textarea></textarea>');
+            } else {
+                textbox = Y.Node.create('<input type="text" />');
+            }
+
+            save.on('click', this.save, this);
+            cancel.on('click', this.cancel, this);
+
+            controls.appendChild(save);
+            controls.appendChild(cancel);
+            editor.appendChild(textbox);
+            editor.appendChild(controls);
+            editor.hide();
+
+            textbox.on('keyup', this._handleKeyPress, this);
+            parentNode.insert(editor, host);
+            this.set('editor', editor);
+        }
+
+        editor.get('firstChild').set('value', text);
+        editor.show();
+        host.hide();
+    },
+    save: function() {
+        var editor = this.get('editor'),
+            host = this.get('host'),
+            save = this.get('saveFn'),
+            value = editor.get('firstChild').get('value');
+        if (save !== null) { save(value); }
+        host.setContent(value);
+        editor.hide();
+        host.show();
+    },
+    _handleKeyPress: function(e) {
+        if (e.keyCode) {
+            if (e.keyCode === 27) { this.cancel(); }
+            if (e.keyCode === 13 && this.get('multiline') === false) {
+                this.save();
+            }
+        }
+    }
+}, {
+    ATTRS: {
+        cancelTemplate: { value: '<button class="phazr-button phazr-cancel">Cancel</button>' },
+        editor: { value: null },
+        multiline: { value: false },
+        saveFn: { value: null },
+        saveTemplate: { value: '<button class="phazr-button phazr-save">Save</button>' }
+    },
+    NS: 'editable'
+});

=== added directory 'src/formplugin'
=== added file 'src/formplugin/build.properties'
--- src/formplugin/build.properties	1970-01-01 00:00:00 +0000
+++ src/formplugin/build.properties	2011-08-24 22:45:23 +0000
@@ -0,0 +1,5 @@
+builddir=../../../builder/componentbuild
+component=phazr-formplugin
+component.jsfiles=form.js
+component.requires=base-build, node, plugin
+component.builddir=../../build

=== added file 'src/formplugin/build.xml'
--- src/formplugin/build.xml	1970-01-01 00:00:00 +0000
+++ src/formplugin/build.xml	2011-08-24 22:45:23 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="Form Plugin" default="local">
+    <description>Phazr Form Plugin</description>
+    <property file="build.properties" />
+    <import file="${builddir}/3.x/bootstrap.xml" description="Default Build Properties and Target" />
+</project>

=== added directory 'src/formplugin/js'
=== renamed file 'src/js/formplugin/formplugin.js' => 'src/formplugin/js/form.js'
--- src/js/formplugin/formplugin.js	2011-06-05 20:54:11 +0000
+++ src/formplugin/js/form.js	2011-08-24 22:45:23 +0000
@@ -1,81 +1,74 @@
-YUI.add('phazr-formplugin', function(Y) {
-
-    var FormPlugin = Y.Base.create('formplugin', Y.Plugin.Base, [], {
-        initializer: function(config) {
-            var host = this.get('host');
-
-            if (config.submitFn) {
-                this.set('submitFn', config.submitFn);
-            }
-
-            this.afterHostMethod('renderUI', this.renderUI);
-            this.afterHostMethod('bindUI', this.bindUI);
-        },
-        renderUI: function() {
-            var host = this.get('host'),
-                saveButton = this.get('saveButton'),
-                cancelButton = this.get('cancelButton'),
-                controls = Y.Node.create('<div></div>');
-            controls.addClass(host.getClassName() + '-controls');
-            controls.appendChild(saveButton);
-            controls.appendChild(cancelButton);
-            host.get('contentBox').appendChild(controls);
-        },
-        bindUI: function() {
-            var host = this.get('host');
-                footer = host.get('boundingBox').one('.yui3-widget-ft');
-            this.get('saveButton').on('click', this.get('submitFn'), this.get('host'));
-            this.get('cancelButton').on('click', this.close, this);
-        },
-        close: function(e) {
-            e.preventDefault();
-            this.get('host').hide();
-        },
-        loadForm: function(form) {
-            var host = this.get('host'),
-                form_node = Y.Node.create(form);
-            host.set('bodyContent', form_node);
-            this.set('form', form_node);
-        },
-        loadFormFromURL: function(url) {
-            var host = this.get('host');
-            Y.io(url, {
-                on: {
-                    success: function(id, response) {
-                        host.loadForm(response.responseText);
-                    }
-                }
-            });
-        }
-    }, {
-        ATTRS: {
-            cancelButton: {
-                valueFn: function() {
-                    return Y.Node.create(this.get('cancelTemplate'));
-                }
-            },
-            cancelTemplate: {
-                value: '<button class="phazr-button phazr-cancel">Cancel</button>'
-            },
-            form: {},
-            saveButton: {
-                valueFn: function() {
-                    return Y.Node.create(this.get('saveTemplate'));
-                }
-            },
-            saveTemplate: {
-                value: '<button class="phazr-button phazr-save">Save</button>'
-            },
-            submitFn: {
-                defaultFn: function() {
-                    return function() {};
-                }
-            }
-        },
-        NS: 'form'
-    });
-    Y.FormPlugin = FormPlugin;
-
-}, '0.1', {requires: [
-    'base', 'node', 'plugin'
-]});
+Y.FormPlugin = Y.Base.create('formplugin', Y.Plugin.Base, [], {
+    initializer: function(config) {
+        var host = this.get('host');
+
+        if (config.submitFn) {
+            this.set('submitFn', config.submitFn);
+        }
+
+        this.afterHostMethod('renderUI', this.renderUI);
+        this.afterHostMethod('bindUI', this.bindUI);
+    },
+    renderUI: function() {
+        var host = this.get('host'),
+            saveButton = this.get('saveButton'),
+            cancelButton = this.get('cancelButton'),
+            controls = Y.Node.create('<div></div>');
+        controls.addClass(host.getClassName() + '-controls');
+        controls.appendChild(saveButton);
+        controls.appendChild(cancelButton);
+        host.get('contentBox').appendChild(controls);
+    },
+    bindUI: function() {
+        var host = this.get('host');
+            footer = host.get('boundingBox').one('.yui3-widget-ft');
+        this.get('saveButton').on('click', this.get('submitFn'), this.get('host'));
+        this.get('cancelButton').on('click', this.close, this);
+    },
+    close: function(e) {
+        e.preventDefault();
+        this.get('host').hide();
+    },
+    loadForm: function(form) {
+        var host = this.get('host'),
+            form_node = Y.Node.create(form);
+        host.set('bodyContent', form_node);
+        this.set('form', form_node);
+    },
+    loadFormFromURL: function(url) {
+        var host = this.get('host');
+        Y.io(url, {
+            on: {
+                success: function(id, response) {
+                    host.loadForm(response.responseText);
+                }
+            }
+        });
+    }
+}, {
+    ATTRS: {
+        cancelButton: {
+            valueFn: function() {
+                return Y.Node.create(this.get('cancelTemplate'));
+            }
+        },
+        cancelTemplate: {
+            value: '<button class="phazr-button phazr-cancel">Cancel</button>'
+        },
+        form: {},
+        saveButton: {
+            valueFn: function() {
+                return Y.Node.create(this.get('saveTemplate'));
+            }
+        },
+        saveTemplate: {
+            value: '<button class="phazr-button phazr-save">Save</button>'
+        },
+        submitFn: {
+            defaultFn: function() {
+                return function() {};
+            }
+        }
+    },
+    NS: 'form'
+});

=== removed directory 'src/js'
=== removed directory 'src/js/editableplugin'
=== removed directory 'src/js/formplugin'
=== removed directory 'src/js/phazroverlay'
=== added directory 'src/phazroverlay'
=== added file 'src/phazroverlay/build.properties'
--- src/phazroverlay/build.properties	1970-01-01 00:00:00 +0000
+++ src/phazroverlay/build.properties	2011-08-24 22:45:23 +0000
@@ -0,0 +1,5 @@
+builddir=../../../builder/componentbuild
+component=phazr-overlay
+component.jsfiles=overlay.js
+component.requires=base-build, dd-delegate, node, overlay, plugin, substitute
+component.builddir=../../build

=== added file 'src/phazroverlay/build.xml'
--- src/phazroverlay/build.xml	1970-01-01 00:00:00 +0000
+++ src/phazroverlay/build.xml	2011-08-24 22:45:23 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="Phazr Overlay" default="local">
+    <description>Phazr Overlay</description>
+    <property file="build.properties" />
+    <import file="${builddir}/3.x/bootstrap.xml" description="Default Build Properties and Target" />
+</project>

=== added directory 'src/phazroverlay/js'
=== renamed file 'src/js/phazroverlay/phazroverlay.js' => 'src/phazroverlay/js/overlay.js'
--- src/js/phazroverlay/phazroverlay.js	2011-07-01 19:37:31 +0000
+++ src/phazroverlay/js/overlay.js	2011-08-24 22:45:23 +0000
@@ -1,83 +1,72 @@
-YUI.add('phazr-overlay', function(Y) {
+var ModalOverlay = function(config) {
+    Y.Do.after(this.afterRenderUI, this, 'renderUI');
+    Y.Do.after(this.afterBindUI, this, 'bindUI');
+};
+ModalOverlay.ATTRS = {
+    closeButton: { value: null },
+    dragDelegate: { value: null }
+};
+ModalOverlay.prototype = {
+    afterRenderUI: function() {
+        var template = '<div class="{containerClassName}"><a class="{linkClassName}"></a></div>',
+            className = this.getClassName(),
+            context = {
+                containerClassName: className + '-close',
+                linkClassName: className + '-close-button'
+            },
+            closeContainer = Y.Node.create(
+                Y.substitute(template, context));
+        this.get('contentBox').prepend(closeContainer);
+        this.set('closeButton',
+            closeContainer.one('.' + className + '-close-button'));
+    },
+    afterBindUI: function() {
+        this.after('renderedChange', this.afterRenderedChange, this);
+        this.after('visibleChange', this.afterVisibleChange, this);
+        this.get('closeButton').on('click', this.hide, this);
+        Y.on('keyup', function(e) {
+            if (e.keyCode == 27) {
+                this.hide();
+            }
+        }, window, this);
 
-    var ModalOverlay = function(config) {
-        Y.Do.after(this.afterRenderUI, this, 'renderUI');
-        Y.Do.after(this.afterBindUI, this, 'bindUI');
-    };
-    ModalOverlay.ATTRS = {
-        closeButton: { value: null },
-        dragDelegate: { value: null }
-    };
-    ModalOverlay.prototype = {
-        afterRenderUI: function() {
-            var template = '<div class="{containerClassName}"><a class="{linkClassName}"></a></div>',
-                className = this.getClassName(),
-                context = {
-                    containerClassName: className + '-close',
-                    linkClassName: className + '-close-button'
-                },
-                closeContainer = Y.Node.create(
-                    Y.substitute(template, context));
-            this.get('contentBox').prepend(closeContainer);
-            this.set('closeButton',
-                closeContainer.one('.' + className + '-close-button'));
-        },
-        afterBindUI: function() {
-            this.after('renderedChange', this.afterRenderedChange, this);
-            this.after('visibleChange', this.afterVisibleChange, this);
-            this.get('closeButton').on('click', this.hide, this);
-            Y.on('keyup', function(e) {
-                if (e.keyCode == 27) {
+        var box = this.get('boundingBox'),
+            className = this.getClassName(),
+            header = box.one('.' + className + '-hd'),
+            dd = new Y.DD.Drag({
+                node: box,
+                handle: header
+            });
+        this.set('dragDelegate', dd);
+    },
+    afterRenderedChange: function(e) {
+        if (e.newVal === false) { return; }
+        if (this.get('visible') === true) {
+            this.attachModalOutside();
+        }
+    },
+    afterVisibleChange: function(e) {
+        if (e.newVal === true) {
+            this.attachModalOutside();
+        } else {
+            this.detachModalOutside();
+        }
+    },
+    attachModalOutside: function() {
+        var box = this.get('boundingBox');
+        Y.one("html").on("modaloutside|click",
+            function(e) {
+                var targ = e.target;
+                if (!box.contains(targ)) {
                     this.hide();
+                    Y.detach("modaloutside|click");
                 }
-            }, window, this);
-
-            var box = this.get('boundingBox'),
-                className = this.getClassName(),
-                header = box.one('.' + className + '-hd'),
-                dd = new Y.DD.Drag({
-                    node: box,
-                    handle: header
-                });
-            this.set('dragDelegate', dd);
-        },
-        afterRenderedChange: function(e) {
-            if (e.newVal === false) { return; }
-            if (this.get('visible') === true) {
-                this.attachModalOutside();
-            }
-        },
-        afterVisibleChange: function(e) {
-            if (e.newVal === true) {
-                this.attachModalOutside();
-            } else {
-                this.detachModalOutside();
-            }
-        },
-        attachModalOutside: function() {
-            var box = this.get('boundingBox');
-            Y.one("html").on("modaloutside|click",
-                function(e) {
-                    var targ = e.target;
-                    if (!box.contains(targ)) {
-                        this.hide();
-                        Y.detach("modaloutside|click");
-                    }
-                },
-            this);
-        },
-        detachModalOutside: function() {
-            Y.one("html").detach("modaloutside|click");
-        }
-    };
-
-    Y.PhazrOverlay = Y.Base.create('overlay', Y.Overlay, [ModalOverlay]);
-
-}, '1.0', { requires: [
-    'base',
-    'dd-delegate',
-    'node',
-    'overlay',
-    'plugin',
-    'substitute'
-]});
+            },
+        this);
+    },
+    detachModalOutside: function() {
+        Y.one("html").detach("modaloutside|click");
+    }
+};
+
+Y.PhazrOverlay = Y.Base.create('overlay', Y.Overlay, [ModalOverlay]);