Merge lp:~edwin-grubbs/launchpad/bug-513260-registry-js-module-names into lp:launchpad

[Edwin Grubbs]

Fixed conflicts between YUI module names, namespaces, and filenames.

[Edwin Grubbs (edwin-grubbs)]

Summary
-------

Fixed conflicts between YUI module names, namespaces, and filenames.

Implementation details
----------------------

The DragScrollEventHandler was declared as a global instead of
in a YUI module, since it doesn't any YUI code. For consistency and
to avoid polluting the global namespace, I moved it into a YUI module.
This involved indenting all the code, so I have also provided a separate
diff at the bottom which shows the non-whitespace changes to the file.
    lib/canonical/launchpad/javascript/lp/dragscroll.js

The milestonetable.js file was being loaded by the productseries-index.pt
and distroseriesindex.pt files directly instead of the base layout. This
is bad since it prevents the js files from being combined.
    lib/lp/app/templates/base-layout-macros.pt
    lib/lp/registry/templates/distroseries-index.pt
    lib/lp/registry/templates/productseries-index.pt

Just renaming modules, namespaces, or files. The yui directory was
also moved from icing/yui/current/build to icing/yui a while ago, and
these tests had not been run since then, so I fixed that also.
    lib/canonical/launchpad/javascript/lp/mapping.js
    lib/canonical/launchpad/javascript/lp/picker.js
    lib/canonical/launchpad/javascript/registry/milestoneoverlay.js
    lib/canonical/launchpad/javascript/registry/milestonetable.js
    lib/canonical/launchpad/javascript/registry/tests/milestone_table.html
    lib/canonical/launchpad/javascript/registry/tests/test_milestone_table.js
    lib/canonical/launchpad/javascript/registry/tests/timeline-iframe.html
    lib/canonical/launchpad/javascript/registry/tests/timeline.html
    lib/canonical/launchpad/javascript/registry/tests/timeline.js
    lib/lp/registry/browser/__init__.py
    lib/lp/registry/browser/tests/productrelease-views.txt
    lib/lp/registry/browser/tests/productseries-views.txt
    lib/lp/registry/templates/object-timeline-graph.pt
    lib/lp/registry/templates/productrelease-add-from-series.pt

Tests
-----

./bin/test -vv --layer RegistryWindmillLayer
file:///./lib/canonical/launchpad/javascript/registry/tests/milestone_table.html
file:///./lib/canonical/launchpad/javascript/registry/tests/timeline.html

Demo and Q/A
------------

* Open https://launchpad.dev/firefox
    * Ensure that timeline graph still shows up and that it can be
      dragged if you zoom in until it doesn't fit.
* Open https://launchpad.dev/firefox/trunk
    * The "Create milestone" link should bring up a form overlay,
      and submitting the form should cause the milestone to appear
      in the table with a green flash.
* Open https://launchpad.dev/ubuntu/warty
    * Same test as for the firefox/trunk product series.
* Open https://launchpad.dev/people/+me/+editlocation
    * The map should appear and it should be possible to edit the
      location.
* Open https://bugs.launchpad.dev/bugs/3
    * The "Subscribe someone else" link should bring up a working picker.

Dragscroll diff without whitespace
----------------------------------

=== modified file 'lib/canonical/launchpad/javascript/lp/dragscroll.js'
--- lib/canonical/launchpad/javascript/lp/dragscroll.js 2009-10-08 17:13:13 +0000
+++ lib/canonical/launchpad/javascrip...

[Abel Deuring (adeuring)]

Hi Edwin,

nice change. I think you should s/Copyright 2009/Copyright 2010/ in milestone_table.js and dragscroll.js.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/javascript/lp/dragscroll.js'
--- lib/canonical/launchpad/javascript/lp/dragscroll.js	2009-10-08 17:13:13 +0000
+++ lib/canonical/launchpad/javascript/lp/dragscroll.js	2010-02-12 16:34:16 +0000
@@ -1,4 +1,10 @@
-/*
+/* Copyright 2010 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * A milestone form overlay that can create a milestone within any page.
+ *
+ * @module Y.lp.dragscroll
+ *
  * Based on dragscroll script by Nicolas Mendoza <[e-mail]>.
  * http://people.opera.com/nicolasm/userjs/dragscroll
  */
@@ -9,126 +15,130 @@
  * @class DragScrollEventHandler
  * @constructor
  */
-DragScrollEventHandler = function() {
-    this.dragging = false;
-    this.last_position = null;
-    this.event_listeners = [];
-}
-
-DragScrollEventHandler.prototype = {
-    /**
-     * Add the event handlers and change the cursor to indicate
-     * that drag scrolling is active.
-     *
-     * @method activate
-     */
-    activate: function() {
-        this._addEventListener("mousedown", this._startDragScroll);
-        this._addEventListener("mouseup", this._stopDragScroll);
-        this._addEventListener("mouseout", this._stopDragScroll);
-        this._addEventListener("mousemove", this._dragScroll);
-        this._setGrabCursor();
-    },
-
-    /**
-     * Remove the event handlers and change the cursor to indicate
-     * that drag scrolling is inactive.
-     *
-     * @method deactivate
-     */
-    deactivate: function() {
-        document.removeEventListener(
-            "mousedown", this._startDragScroll, false);
-        this._removeEventListeners();
-        this._unsetCursor();
-    },
-
-    _addEventListener: function(event_type, action) {
-        // Wrap the method in a different function that forces
-        // `this` to be the `DragScrollEventHandler` object.
-        var self = this;
-        var event_listener = function(e) {
-            action.call(self, e)
-        };
-        var event_args = [event_type, event_listener, false];
-        this.event_listeners.push(event_args);
-        document.addEventListener.apply(document, event_args);
-    },
-
-    _removeEventListeners: function() {
-        for (var i=0; i<this.event_listeners.length; i++) {
-            var event_args = this.event_listeners[i];
-            document.removeEventListener.apply(document, event_args);
-        }
-    },
-
-    _unsetCursor: function() {
-        document.body.style.cursor = '';
-    },
-
-    _setGrabCursor: function() {
-        // Styles for W3C, IE, Mozilla, Webkit.
-        // Unknown styles will fail to change the value.
-        document.body.style.cursor = 'move';
-        document.body.style.cursor = 'grab';
-        document.body.style.cursor = '-moz-grab';
-        document.body.style.cursor = '-webkit-grab';
-    },
-
-    _setGrabbingCursor: function() {
-        // Styles for IE, Mozilla, and Webkit.
-        // Unknown styles will fail to change the value.
-        document.body.style.cursor = 'grabbing';
-        document.body.style.cursor = '-moz-grabbing';
-        document.body.style.cursor = '-webkit-grabbing';
-    },
-
-    /**
-     * MouseDown event handler that causes _dragScroll to
-     * take action when it receives a MouseMove event.
-     *
-     * @method _startDragScroll
-     */
-    _startDragScroll: function(e) {
-        if (e.button == 0) {
-            this.dragging = true;
-            this.last_position = e;
-            this._setGrabbingCursor();
-        }
-        e.preventDefault();
-        e.stopPropagation();
-    },
-
-    /**
-     * MouseUp & MouseOut event handler that causes _dragScroll to
-     * once again ignore MouseMove events. Stopping dragging when
-     * the MouseOut event occurs is helpful, since the MouseUp event
-     * is not reliable, when the mouse is outside the window.
-     *
-     * @method _stopDragScroll
-     */
-    _stopDragScroll: function(e) {
+YUI.add('lp.dragscroll', function(Y) {
+    var module = Y.namespace('lp.dragscroll');
+
+    module.DragScrollEventHandler = function() {
         this.dragging = false;
-        this._setGrabCursor();
-        e.preventDefault();
-        e.stopPropagation();
-    },
-
-    /**
-     * MouseMove event handler that calculates the movement
-     * by comparing the mouse positions in the current event and
-     * the previous event.
-     *
-     * @method _dragScroll
-     */
-    _dragScroll: function(e) {
-        if (this.dragging) {
-            window.scrollBy(
-                this.last_position.clientX - e.clientX,
-                this.last_position.clientY - e.clientY);
-            this.last_position = e;
-            e.preventDefault();
-            e.stopPropagation();
+        this.last_position = null;
+        this.event_listeners = [];
+    };
+
+    module.DragScrollEventHandler.prototype = {
+        /**
+        * Add the event handlers and change the cursor to indicate
+        * that drag scrolling is active.
+        *
+        * @method activate
+        */
+        activate: function() {
+            this._addEventListener("mousedown", this._startDragScroll);
+            this._addEventListener("mouseup", this._stopDragScroll);
+            this._addEventListener("mouseout", this._stopDragScroll);
+            this._addEventListener("mousemove", this._dragScroll);
+            this._setGrabCursor();
+        },
+
+        /**
+        * Remove the event handlers and change the cursor to indicate
+        * that drag scrolling is inactive.
+        *
+        * @method deactivate
+        */
+        deactivate: function() {
+            document.removeEventListener(
+                "mousedown", this._startDragScroll, false);
+            this._removeEventListeners();
+            this._unsetCursor();
+        },
+
+        _addEventListener: function(event_type, action) {
+            // Wrap the method in a different function that forces
+            // `this` to be the `DragScrollEventHandler` object.
+            var self = this;
+            var event_listener = function(e) {
+                action.call(self, e);
+            };
+            var event_args = [event_type, event_listener, false];
+            this.event_listeners.push(event_args);
+            document.addEventListener.apply(document, event_args);
+        },
+
+        _removeEventListeners: function() {
+            for (var i=0; i<this.event_listeners.length; i++) {
+                var event_args = this.event_listeners[i];
+                document.removeEventListener.apply(document, event_args);
+            }
+        },
+
+        _unsetCursor: function() {
+            document.body.style.cursor = '';
+        },
+
+        _setGrabCursor: function() {
+            // Styles for W3C, IE, Mozilla, Webkit.
+            // Unknown styles will fail to change the value.
+            document.body.style.cursor = 'move';
+            document.body.style.cursor = 'grab';
+            document.body.style.cursor = '-moz-grab';
+            document.body.style.cursor = '-webkit-grab';
+        },
+
+        _setGrabbingCursor: function() {
+            // Styles for IE, Mozilla, and Webkit.
+            // Unknown styles will fail to change the value.
+            document.body.style.cursor = 'grabbing';
+            document.body.style.cursor = '-moz-grabbing';
+            document.body.style.cursor = '-webkit-grabbing';
+        },
+
+        /**
+        * MouseDown event handler that causes _dragScroll to
+        * take action when it receives a MouseMove event.
+        *
+        * @method _startDragScroll
+        */
+        _startDragScroll: function(e) {
+            if (e.button === 0) {
+                this.dragging = true;
+                this.last_position = e;
+                this._setGrabbingCursor();
+            }
+            e.preventDefault();
+            e.stopPropagation();
+        },
+
+        /**
+        * MouseUp & MouseOut event handler that causes _dragScroll to
+        * once again ignore MouseMove events. Stopping dragging when
+        * the MouseOut event occurs is helpful, since the MouseUp event
+        * is not reliable, when the mouse is outside the window.
+        *
+        * @method _stopDragScroll
+        */
+        _stopDragScroll: function(e) {
+            this.dragging = false;
+            this._setGrabCursor();
+            e.preventDefault();
+            e.stopPropagation();
+        },
+
+        /**
+        * MouseMove event handler that calculates the movement
+        * by comparing the mouse positions in the current event and
+        * the previous event.
+        *
+        * @method _dragScroll
+        */
+        _dragScroll: function(e) {
+            if (this.dragging) {
+                window.scrollBy(
+                    this.last_position.clientX - e.clientX,
+                    this.last_position.clientY - e.clientY);
+                this.last_position = e;
+                e.preventDefault();
+                e.stopPropagation();
+            }
         }
-    }
-};
+    };
+}, "0.1", {"requires": []});

=== modified file 'lib/canonical/launchpad/javascript/lp/mapping.js'
--- lib/canonical/launchpad/javascript/lp/mapping.js	2009-11-24 09:30:01 +0000
+++ lib/canonical/launchpad/javascript/lp/mapping.js	2010-02-12 16:34:16 +0000
@@ -8,19 +8,19 @@
  * @required Google GMap2
  */
 YUI.add('lp.mapping', function(Y) {
-    var mapping = Y.namespace('lp.mapping');
+    var module = Y.namespace('lp.mapping');
 
-    mapping.RETURN_FALSE = function() {return false;};
-    mapping.RETURN_NULL = function() {return null;};
+    module.RETURN_FALSE = function() {return false;};
+    module.RETURN_NULL = function() {return null;};
 
     // Replace the crucial GMap functions so that the supporting functions
     // will work if the GMap script is not loaded.
-    var gBrowserIsCompatible = mapping.RETURN_FALSE;
-    var gDownloadUrl = mapping.RETURN_NULL;
-
-    mapping.has_gmaps = (typeof(GBrowserIsCompatible) == 'function');
-
-    if (mapping.has_gmaps) {
+    var gBrowserIsCompatible = module.RETURN_FALSE;
+    var gDownloadUrl = module.RETURN_NULL;
+
+    module.has_gmaps = (typeof(GBrowserIsCompatible) == 'function');
+
+    if (module.has_gmaps) {
         // The GMap2 is is loaded; use the real functions.
         // jslint does not like functions that look like classes.
         gBrowserIsCompatible = GBrowserIsCompatible;
@@ -37,7 +37,7 @@
      * @param {GLatLngBounds} required_bounds the boundaries or null.
      * @param {limit} optional max number of markers to set.
      */
-    mapping.setMarkersInfoWindow = function(data, map, required_bounds,
+    module.setMarkersInfoWindow = function(data, map, required_bounds,
                                             limit) {
         var xml = GXml.parse(data);
         var markers = xml.documentElement.getElementsByTagName("participant");
@@ -79,9 +79,9 @@
      * @param {GMap2} map the Google map to add the markers to.
      * @param {limit} optional max number of markers to set.
      */
-    mapping.setMarkersInfoWindowForSmallMap = function(data, map, limit) {
+    module.setMarkersInfoWindowForSmallMap = function(data, map, limit) {
         var required_bounds = new GLatLngBounds();
-        mapping.setMarkersInfoWindow(data, map, required_bounds, limit);
+        module.setMarkersInfoWindow(data, map, required_bounds, limit);
         var zoom_level = map.getBoundsZoomLevel(required_bounds);
         // Some browsers do not display the map when the zoom_level is at the
         // end of the range, reduce the zoom_level by 1.
@@ -100,7 +100,7 @@
      * @param {String} lat_name the id of the latitude field.
      * @param {String} lng_name the id of the longitude field.
      */
-    mapping.setLocation = function(lat, lng, geoname,
+    module.setLocation = function(lat, lng, geoname,
                                    tz_name, lat_name, lng_name) {
         Y.one(Y.DOM.byId(lat_name)).set('value', lat);
         Y.one(Y.DOM.byId(lng_name)).set('value', lng);
@@ -134,13 +134,13 @@
      * @function toggleShowSmallMaps
      * @param {Event} e the event for this callback.
      */
-    mapping.toggleShowSmallMaps = function (checkbox) {
+    module.toggleShowSmallMaps = function (checkbox) {
         var is_shown = checkbox.get('checked');
         Y.lp.launchpad_views.set('small_maps', is_shown);
         var display = is_shown ? 'block' : 'none';
         var maps = Y.all('.small-map');
         maps.each(function(map) {map.setStyle('display', display);});
-        if (is_shown && !mapping.has_gmaps) {
+        if (is_shown && !module.has_gmaps) {
             // The server must add the Google GMap2 dependencies to the page.
             window.location.reload();
         }
@@ -152,14 +152,14 @@
      * @function setupShowSmallMapsControl
      * @param {String} div_id the CSS3 id of the div that controls the map.
      */
-    mapping.setupShowSmallMapsControl = function (div_id) {
+    module.setupShowSmallMapsControl = function (div_id) {
         var show_small_maps = Y.lp.launchpad_views.get('small_maps');
         var checkbox = Y.Node.create(
             '<input type="checkbox" name="show_small_maps" />');
         checkbox.set(
             'checked', show_small_maps);
         checkbox.on(
-            'click', function(e) {mapping.toggleShowSmallMaps(checkbox);});
+            'click', function(e) {module.toggleShowSmallMaps(checkbox);});
         var label_text = Y.Node.create('Display map');
         var label = Y.Node.create('<label></label>');
         label.appendChild(checkbox);
@@ -167,7 +167,7 @@
         var action_div = Y.one(div_id);
         action_div.appendChild(label);
         if (!show_small_maps) {
-            mapping.toggleShowSmallMaps(checkbox);
+            module.toggleShowSmallMaps(checkbox);
         }
     };
 
@@ -180,7 +180,7 @@
      * @param {Number} center_lng a GLatLng.lng bounded number.
      * @return {GMap2} the Google map
      */
-    mapping.getSmallMap = function(div_id, center_lat, center_lng) {
+    module.getSmallMap = function(div_id, center_lat, center_lng) {
         var mapdiv = Y.DOM.byId(div_id);
         mapdiv.style.width = '400px';
         var map = new GMap2(mapdiv);
@@ -197,12 +197,12 @@
      * @param {Number} center_lat a GLatLng.lat bounded number.
      * @param {Number} center_lng a GLatLng.lng bounded number.
      */
-    mapping.renderPersonMapSmall = function(center_lat, center_lng) {
-        mapping.setupShowSmallMapsControl('#person_map_actions');
+    module.renderPersonMapSmall = function(center_lat, center_lng) {
+        module.setupShowSmallMapsControl('#person_map_actions');
         if (!gBrowserIsCompatible()) {
             return;
         }
-        var map = mapping.getSmallMap(
+        var map = module.getSmallMap(
             'person_map_div', center_lat, center_lng);
         map.addControl(new GSmallZoomControl());
         var center = new GLatLng(center_lat, center_lng);
@@ -218,15 +218,15 @@
      * @param {Number} center_lat a GLatLng.lat bounded number.
      * @param {Number} center_lng a GLatLng.lng bounded number.
      */
-    mapping.renderTeamMapSmall = function(center_lat, center_lng) {
-        mapping.setupShowSmallMapsControl('#team_map_actions');
+    module.renderTeamMapSmall = function(center_lat, center_lng) {
+        module.setupShowSmallMapsControl('#team_map_actions');
         if (!gBrowserIsCompatible()) {
             return;
         }
-        var team_map = mapping.getSmallMap(
+        var team_map = module.getSmallMap(
             'team_map_div', center_lat, center_lng);
         gDownloadUrl("+mapdataltd", function(data) {
-            mapping.setMarkersInfoWindowForSmallMap(data, team_map);
+            module.setMarkersInfoWindowForSmallMap(data, team_map);
             });
     };
 
@@ -237,7 +237,7 @@
      * @param {String} div_id the id of the map div.
      * @return {GMap2} The Google map
      */
-    mapping.getLargeMap = function(div_id) {
+    module.getLargeMap = function(div_id) {
         var mapdiv = Y.DOM.byId(div_id);
         var mapheight = (parseInt(mapdiv.offsetWidth, 10) / 16 * 9);
         mapheight = Math.min(mapheight, Y.DOM.winHeight() - 180);
@@ -276,12 +276,12 @@
      * @param {Number} center_lat a GLatLng.lat bounded number.
      * @param {Number} center_lng a GLatLng.lng bounded number.
      */
-    mapping.renderTeamMap = function(min_lat, max_lat, min_lng, max_lng,
+    module.renderTeamMap = function(min_lat, max_lat, min_lng, max_lng,
                                      center_lat, center_lng) {
         if (!gBrowserIsCompatible()) {
             return;
         }
-        var team_map = mapping.getLargeMap("team_map_div");
+        var team_map = module.getLargeMap("team_map_div");
         var center = new GLatLng(center_lat, center_lng);
         team_map.setCenter(center, 0);
         var sw = new GLatLng(min_lat, min_lng);
@@ -294,7 +294,7 @@
             G_HYBRID_MAP.getMaximumResolution(), zoom_level - 1);
         team_map.setZoom(zoom_level);
         gDownloadUrl("+mapdata", function(data) {
-            mapping.setMarkersInfoWindow(data, team_map);
+            module.setMarkersInfoWindow(data, team_map);
             });
     };
 
@@ -314,13 +314,13 @@
      * @param {number} zoom the initial zoom-level.
      * @param {Boolean} show_marker Show the marker for the person.
      */
-    mapping.renderPersonMap = function(center_lat, center_lng, displayname,
+    module.renderPersonMap = function(center_lat, center_lng, displayname,
                                        name, logo_html, geoname, lat_name,
                                        lng_name, tz_name, zoom, show_marker) {
         if (!gBrowserIsCompatible()) {
             return;
         }
-        var map = mapping.getLargeMap('map_div');
+        var map = module.getLargeMap('map_div');
         var center = new GLatLng(center_lat, center_lng);
         map.setCenter(center, zoom);
         var marker = new GMarker(center, {draggable: true});
@@ -333,7 +333,7 @@
 
         GEvent.addListener(marker, "dragend", function() {
             var point = marker.getLatLng();
-            mapping.setLocation(
+            module.setLocation(
                 point.lat(), point.lng(), geoname,
                 tz_name, lat_name, lng_name);
         });
@@ -357,7 +357,7 @@
                 marker.show();
                 map.panTo(point);
             }
-            mapping.setLocation(
+            module.setLocation(
                 point.lat(), point.lng(), geoname,
                 tz_name, lat_name, lng_name);
         });

=== modified file 'lib/canonical/launchpad/javascript/lp/picker.js'
--- lib/canonical/launchpad/javascript/lp/picker.js	2010-01-29 10:52:58 +0000
+++ lib/canonical/launchpad/javascript/lp/picker.js	2010-02-12 16:34:16 +0000
@@ -2,7 +2,7 @@
 
 Y.log('loading lp.picker');
 
-Y.namespace('lp.picker');
+var module = Y.namespace('lp.picker');
 
 var BATCH_SIZE = 6;
 var MAX_BATCHES = 20;
@@ -24,7 +24,7 @@
  *                        config.step_title overrides the subtitle.
  *                        description strings.
  */
-Y.lp.picker.addPickerPatcher = function (
+module.addPickerPatcher = function (
     vocabulary, resource_uri, attribute_name,
     content_box_id, show_remove_button, show_assign_me_button, config) {
 
@@ -151,7 +151,7 @@
     };
 
     config.save = save;
-    var picker = Y.lp.picker.create(vocabulary, config);
+    var picker = module.create(vocabulary, config);
     picker._resource_uri = resource_uri;
     var extra_buttons = Y.Node.create(
         '<div style="text-align: center; height: 3em; ' +
@@ -200,7 +200,7 @@
   *                        config.save is a Function (optional) which takes
   *                        a single string argument.
   */
-Y.lp.picker.create = function (vocabulary, config) {
+module.create = function (vocabulary, config) {
     if (Y.UA.ie) {
         return;
     }

=== modified file 'lib/canonical/launchpad/javascript/registry/milestoneoverlay.js'
--- lib/canonical/launchpad/javascript/registry/milestoneoverlay.js	2009-11-24 09:30:01 +0000
+++ lib/canonical/launchpad/javascript/registry/milestoneoverlay.js	2010-02-12 16:34:16 +0000
@@ -3,12 +3,12 @@
  *
  * A milestone form overlay that can create a milestone within any page.
  *
- * @module Y.lp.milestoneoverlay
+ * @module Y.registry.milestoneoverlay
  * @requires  dom, node, io-base, lazr.anim, lazr.formoverlay
  */
-YUI.add('lp.milestoneoverlay', function(Y) {
-    Y.log('loading lp.milestoneoverlay');
-    var milestoneoverlay = Y.namespace('lp.milestoneoverlay');
+YUI.add('registry.milestoneoverlay', function(Y) {
+    Y.log('loading registry.milestoneoverlay');
+    var module = Y.namespace('registry.milestoneoverlay');
 
     var milestone_form;
     var milestone_form_uri;
@@ -96,7 +96,7 @@
       *                        next_step is the function to be called after
       *                            the milestone is created.
       */
-    milestoneoverlay.attach_widget = function(config) {
+    module.attach_widget = function(config) {
         if (Y.UA.ie) {
             return;
         }

=== renamed file 'lib/canonical/launchpad/javascript/registry/milestone_table.js' => 'lib/canonical/launchpad/javascript/registry/milestonetable.js'
--- lib/canonical/launchpad/javascript/registry/milestone_table.js	2009-11-25 18:16:41 +0000
+++ lib/canonical/launchpad/javascript/registry/milestonetable.js	2010-02-12 16:34:16 +0000
@@ -1,13 +1,21 @@
-YUI.add('lp.milestonetable', function(Y) {
-    Y.log('loading lp.milestonetable');
-    var self = Y.namespace('lp.milestonetable');
+/* Copyright 2010 Canonical Ltd.  This software is licensed under the
+ * GNU Affero General Public License version 3 (see the file LICENSE).
+ *
+ * Dynamically add milestones to an HTML table.
+ *
+ * @module Y.registry.milestonetable
+ * @requires node, io-base, substitute, lazr.anim
+ */
+YUI.add('registry.milestonetable', function(Y) {
+    Y.log('loading registry.milestonetable');
+    var module = Y.namespace('registry.milestonetable');
 
     // get_milestone_row() needs these when it is called. Other methods
     // should get this information passed as an argument.
-    self._milestone_row_uri_template = null;
-    self._tbody = null;
+    module._milestone_row_uri_template = null;
+    module._tbody = null;
 
-    self._prepend_node = function(parent_node, child_node) {
+    module._prepend_node = function(parent_node, child_node) {
         // Add the child_node to the parent_node as the first item.
         var children = parent_node.get('children');
         if (children === null) {
@@ -17,13 +25,13 @@
             }
         };
 
-    self._ensure_table_is_seen = function(tbody) {
+    module._ensure_table_is_seen = function(tbody) {
         // Remove the 'unseen' class from the table to ensure it is visible.
         table = tbody.ancestor();
         table.removeClass('unseen');
         };
 
-    self._clear_add_handlers = function(data) {
+    module._clear_add_handlers = function(data) {
         // Detach the callback and errorback functions from the Y.io events.
         // The data has been used. If they are not detached, there will be
         // multiple adds for each use of the Create milestone link.
@@ -31,36 +39,36 @@
         data.failure_handle.detach();
         };
 
-    self._on_add_success = function(id, response, data) {
+    module._on_add_success = function(id, response, data) {
         // Add the milestone to the milestone table on Y.io success.
         var row = Y.Node.create(Y.Lang.trim(response.responseText));
-        self._ensure_table_is_seen(data.tbody);
-        self._prepend_node(data.tbody, row);
+        module._ensure_table_is_seen(data.tbody);
+        module._prepend_node(data.tbody, row);
         Y.lazr.anim.green_flash({node: row}).run();
-        self._clear_add_handlers(data);
+        module._clear_add_handlers(data);
         };
 
-    self._on_add_failure = function(id, response, data) {
+    module._on_add_failure = function(id, response, data) {
         // Add the failure message to the milestone table on Y.io failure.
         var row = Y.Node.create(Y.substitute(
             '<tr><td colspan="0">' +
             'Could not retrieve milestone {name}</td></tr>', data));
-        self._ensure_table_is_seen(data.tbody);
-        self._prepend_node(data.tbody, row);
+        module._ensure_table_is_seen(data.tbody);
+        module._prepend_node(data.tbody, row);
         Y.lazr.anim.red_flash({node: row}).run();
-        self._clear_add_handlers(data);
+        module._clear_add_handlers(data);
         };
 
-    self._setup_milestone_event_data = function(parameters, tbody) {
+    module._setup_milestone_event_data = function(parameters, tbody) {
         // Attach the callback to the Y.io event and return their data
         var data = {
             name: parameters.name,
             tbody: tbody
             };
         data.success_handle = Y.on(
-            'io:success', self._on_add_success, this, data);
+            'io:success', module._on_add_success, this, data);
         data.failure_handle = Y.on(
-            'io:failure', self._on_add_failure, this, data);
+            'io:failure', module._on_add_failure, this, data);
         return data;
         };
 
@@ -73,24 +81,24 @@
       * @param {Object} parameters Object literal of config name/value pairs.
       *     The form parameters that were submitted to create the milestone.
       */
-    self.get_milestone_row = function(parameters) {
-        self._setup_milestone_event_data(parameters, self._tbody);
+    module.get_milestone_row = function(parameters) {
+        module._setup_milestone_event_data(parameters, module._tbody);
         var milestone_row_uri = Y.substitute(
-            self._milestone_row_uri_template, parameters);
+            module._milestone_row_uri_template, parameters);
         Y.io(milestone_row_uri);
         };
 
     /**
       * Setup the URL to get the milestone and the table it will be added too.
       *
-      * @method get_milestone_row
+      * @method setup
       * @param {Object} parameters Object literal of config name/value pairs.
       *     config.milestone_row_uri_template is the Y.substitute template
       *         that is used to create the URL to get the milestone row.
       *     config.milestone_rows_id is the id the the tbody that the
       *         milestone row will be added too.
       */
-    self.setup =  function(config) {
+    module.setup =  function(config) {
         if (config === undefined) {
             throw new Error(
                 "Missing setup config for milestonetable.");
@@ -100,9 +108,9 @@
             throw new Error(
                 "Undefined properties in setup config for milestonetable.");
             }
-        self._milestone_row_uri_template = config.milestone_row_uri_template;
-        self._tbody = Y.one(config.milestone_rows_id);
-        if (self._tbody === null) {
+        module._milestone_row_uri_template = config.milestone_row_uri_template;
+        module._tbody = Y.one(config.milestone_rows_id);
+        if (module._tbody === null) {
             throw new Error(
                 Y.substitute("'{milestone_rows_id}' not in page.", config));
             }

=== modified file 'lib/canonical/launchpad/javascript/registry/tests/milestone_table.html'
--- lib/canonical/launchpad/javascript/registry/tests/milestone_table.html	2009-09-14 15:03:45 +0000
+++ lib/canonical/launchpad/javascript/registry/tests/milestone_table.html	2010-02-12 16:34:16 +0000
@@ -4,15 +4,15 @@
   <title>Launchpad milestonetable</title>
 
   <!-- YUI 3.0 Setup -->
-  <script type="text/javascript" src="../../../icing/yui/current/build/yui/yui.js"></script>
+  <script type="text/javascript" src="../../../icing/yui/yui/yui.js"></script>
   <script type="text/javascript" src="../../../icing/lazr/build/lazr.js"></script>
-  <link rel="stylesheet" href="../../../icing/yui/current/build/cssreset/reset.css"/>
-  <link rel="stylesheet" href="../../../icing/yui/current/build/cssfonts/fonts.css"/>
-  <link rel="stylesheet" href="../../../icing/yui/current/build/cssbase/base.css"/>
+  <link rel="stylesheet" href="../../../icing/yui/cssreset/reset.css"/>
+  <link rel="stylesheet" href="../../../icing/yui/cssfonts/fonts.css"/>
+  <link rel="stylesheet" href="../../../icing/yui/cssbase/base.css"/>
   <link rel="stylesheet" href="../../test.css" />
 
   <!-- The module under test -->
-  <script type="text/javascript" src="../milestone_table.js"></script>
+  <script type="text/javascript" src="../milestonetable.js"></script>
 
   <!-- The test suite -->
   <script type="text/javascript" src="test_milestone_table.js"></script>

=== modified file 'lib/canonical/launchpad/javascript/registry/tests/test_milestone_table.js'
--- lib/canonical/launchpad/javascript/registry/tests/test_milestone_table.js	2009-11-25 19:21:59 +0000
+++ lib/canonical/launchpad/javascript/registry/tests/test_milestone_table.js	2010-02-12 16:34:16 +0000
@@ -1,11 +1,11 @@
 /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
 
 YUI({
-    base: '../../../icing/yui/current/build/',
+    base: '../../../icing/yui/',
     filter: 'raw', combine: false
-    }).use('test', 'console', 'lp.milestonetable', function(Y) {
+    }).use('test', 'console', 'registry.milestonetable', function(Y) {
 
-    var milestonetable = Y.lp.milestonetable;
+    var milestonetable = Y.registry.milestonetable;
     var suite = new Y.Test.Suite("milestonetable Tests");
 
     suite.add(new Y.Test.Case({

=== modified file 'lib/canonical/launchpad/javascript/registry/tests/timeline-iframe.html'
--- lib/canonical/launchpad/javascript/registry/tests/timeline-iframe.html	2009-10-08 22:52:35 +0000
+++ lib/canonical/launchpad/javascript/registry/tests/timeline-iframe.html	2010-02-12 16:34:16 +0000
@@ -4,10 +4,10 @@
   <title>Launchpad TimelineGraph Widget</title>
 
   <!-- YUI 3.0 Setup -->
-  <script type="text/javascript" src="../../../icing/yui/current/build/yui/yui.js"></script>
-  <link rel="stylesheet" href="../../../icing/yui/current/build/cssreset/reset.css"/>
-  <link rel="stylesheet" href="../../../icing/yui/current/build/cssfonts/fonts.css"/>
-  <link rel="stylesheet" href="../../../icing/yui/current/build/cssbase/base.css"/>
+  <script type="text/javascript" src="../../../icing/yui/yui/yui.js"></script>
+  <link rel="stylesheet" href="../../../icing/yui/cssreset/reset.css"/>
+  <link rel="stylesheet" href="../../../icing/yui/cssfonts/fonts.css"/>
+  <link rel="stylesheet" href="../../../icing/yui/cssbase/base.css"/>
 
   <!-- The module under test -->
   <script type="text/javascript" src="../timeline.js"></script>

=== modified file 'lib/canonical/launchpad/javascript/registry/tests/timeline.html'
--- lib/canonical/launchpad/javascript/registry/tests/timeline.html	2009-07-01 02:25:33 +0000
+++ lib/canonical/launchpad/javascript/registry/tests/timeline.html	2010-02-12 16:34:16 +0000
@@ -7,6 +7,7 @@
   name="timeline-iframe"
   src="timeline-iframe.html"
   height="100%"
-  width="100%" />
+  width="100%">
+</iframe>
 </body>
 </html>

=== modified file 'lib/canonical/launchpad/javascript/registry/tests/timeline.js'
--- lib/canonical/launchpad/javascript/registry/tests/timeline.js	2009-11-25 19:21:59 +0000
+++ lib/canonical/launchpad/javascript/registry/tests/timeline.js	2010-02-12 16:34:16 +0000
@@ -1,7 +1,7 @@
 /* Copyright (c) 2009, Canonical Ltd. All rights reserved. */
 
 YUI({
-    base: '../../../icing/yui/current/build/',
+    base: '../../../icing/yui/',
     filter: 'raw',
     combine: false
     }).use('test', 'console', 'registry.timeline', function(Y) {

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-02-08 18:21:24 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-02-12 16:34:16 +0000
@@ -176,6 +176,8 @@
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/registry/milestoneoverlay.js"></script>
     <script type="text/javascript"
+            tal:attributes="src string:${lp_js}/registry/milestonetable.js"></script>
+    <script type="text/javascript"
             tal:attributes="src string:${lp_js}/registry/timeline.js"></script>
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/sorttable/sorttable.js"></script>

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2009-10-05 16:41:55 +0000
+++ lib/lp/registry/browser/__init__.py	2010-02-12 16:34:16 +0000
@@ -101,7 +101,7 @@
             }
         return """
             YUI().use(
-                'node', 'lp.milestoneoverlay', 'lp.milestonetable',
+                'node', 'registry.milestoneoverlay', 'registry.milestonetable',
                 function (Y) {
 
                 var series_uri = '%(series_api_uri)s';
@@ -116,15 +116,15 @@
                     var config = {
                         milestone_form_uri: milestone_form_uri,
                         series_uri: series_uri,
-                        next_step: Y.lp.milestonetable.get_milestone_row,
+                        next_step: Y.registry.milestonetable.get_milestone_row,
                         activate_node: create_milestone_link
                         };
-                    Y.lp.milestoneoverlay.attach_widget(config);
+                    Y.registry.milestoneoverlay.attach_widget(config);
                     var table_config = {
                         milestone_row_uri_template: milestone_row_uri,
                         milestone_rows_id: milestone_rows_id
                         }
-                    Y.lp.milestonetable.setup(table_config);
+                    Y.registry.milestonetable.setup(table_config);
                 });
             });
             """ % uris

=== modified file 'lib/lp/registry/browser/tests/productrelease-views.txt'
--- lib/lp/registry/browser/tests/productrelease-views.txt	2010-01-22 03:01:19 +0000
+++ lib/lp/registry/browser/tests/productrelease-views.txt	2010-02-12 16:34:16 +0000
@@ -124,7 +124,7 @@
     >>> script = find_tag_by_id(view.render(), 'milestone-script')
     >>> print script
     <script id="milestone-script" type="text/javascript">
-        LPS.use(... 'lp.milestoneoverlay'...
+        LPS.use(... 'registry.milestoneoverlay'...
             var milestone_form_uri = '.../app/simple/+addmilestone/++form++';
             var series_uri = '/app/simple';
             ...

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-01-20 15:41:25 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-02-12 16:34:16 +0000
@@ -33,7 +33,7 @@
     >>> script = find_tag_by_id(view.render(), 'milestone-script')
     >>> print script
     <script id="milestone-script" type="text/javascript">
-        YUI().use(... 'lp.milestoneoverlay', 'lp.milestonetable'...
+        YUI().use(... 'registry.milestoneoverlay', 'registry.milestonetable'...
             var series_uri = '/app/simple';
             var milestone_form_uri = '.../app/simple/+addmilestone/++form++';
             var milestone_row_uri =
@@ -43,8 +43,8 @@
                 var create_milestone_link = Y.get(
                     '.menu-link-create_milestone');
                 create_milestone_link.addClass('js-action');...
-                Y.lp.milestoneoverlay.attach_widget(config);...
-                Y.lp.milestonetable.setup(table_config);...
+                Y.registry.milestoneoverlay.attach_widget(config);...
+                Y.registry.milestonetable.setup(table_config);...
 
 If the Create milestone link is not enabled, the script is not present.
 

=== modified file 'lib/lp/registry/templates/distroseries-index.pt'
--- lib/lp/registry/templates/distroseries-index.pt	2009-12-04 00:15:41 +0000
+++ lib/lp/registry/templates/distroseries-index.pt	2010-02-12 16:34:16 +0000
@@ -9,9 +9,6 @@
     <metal:block fill-slot="head_epilogue">
       <metal:yui-dependencies
         use-macro="context/@@launchpad_widget_macros/yui2calendar-dependencies" />
-      <script type="text/javascript"
-        tal:define="lp_js string:${icingroot}/build"
-        tal:attributes="src string:${lp_js}/registry/milestone_table.js"></script>
       <script id="milestone-script" type="text/javascript"
         tal:condition="context/menu:overview/create_milestone/enabled"
         tal:content="view/register_milestone_script"></script>

=== modified file 'lib/lp/registry/templates/object-timeline-graph.pt'
--- lib/lp/registry/templates/object-timeline-graph.pt	2009-12-19 18:50:39 +0000
+++ lib/lp/registry/templates/object-timeline-graph.pt	2010-02-12 16:34:16 +0000
@@ -34,7 +34,7 @@
           include_inactive = false;
       }
 
-      LPS.use('registry.timeline', 'node', function(Y) {
+      LPS.use('registry.timeline', 'node', 'lp.dragscroll', function(Y) {
           Y.on('domready', function(e) {
               if (Y.UA.ie) {
                   return;
@@ -88,7 +88,8 @@
                       }
                   });
 
-              var drag_scroll_handler = new DragScrollEventHandler();
+              var drag_scroll_handler =
+                  new Y.lp.dragscroll.DragScrollEventHandler();
               drag_scroll_handler.activate();
           });
       });

=== modified file 'lib/lp/registry/templates/productrelease-add-from-series.pt'
--- lib/lp/registry/templates/productrelease-add-from-series.pt	2009-12-03 18:33:22 +0000
+++ lib/lp/registry/templates/productrelease-add-from-series.pt	2010-02-12 16:34:16 +0000
@@ -14,7 +14,7 @@
   <tal:script
     replace="structure
     string:&lt;script id='milestone-script' type='text/javascript'&gt;" />
-    LPS.use('node', 'lp.milestoneoverlay', function (Y) {
+    LPS.use('node', 'registry.milestoneoverlay', function (Y) {
 
         // This is a value for the SELECT OPTION which is passed with
         // the SELECT's "change" event. It includes some symbols that are not
@@ -57,7 +57,7 @@
                 activate_node: create_milestone_link
                 };
             if (!Y.UA.ie) {
-                Y.lp.milestoneoverlay.attach_widget(config);
+                Y.registry.milestoneoverlay.attach_widget(config);
             }
         });
     });

=== modified file 'lib/lp/registry/templates/productseries-index.pt'
--- lib/lp/registry/templates/productseries-index.pt	2009-11-25 18:04:43 +0000
+++ lib/lp/registry/templates/productseries-index.pt	2010-02-12 16:34:16 +0000
@@ -11,9 +11,6 @@
   <metal:block fill-slot="head_epilogue">
     <metal:yui-dependencies
       use-macro="context/@@launchpad_widget_macros/yui2calendar-dependencies" />
-    <script type="text/javascript"
-      tal:define="lp_js string:${icingroot}/build"
-      tal:attributes="src string:${lp_js}/registry/milestone_table.js"></script>
     <script id="milestone-script" type="text/javascript"
       tal:condition="context/menu:overview/create_milestone/enabled"
       tal:content="view/register_milestone_script"></script>