Merge lp:~rockstar/launchpad/code-js-reorg into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi there-

  This branch just fixes bug 513270. Basically, the code Javascript doesn't
conform to our new(er) Javascript standards. This branch is actually a split
up version of what I wanted to do with the javascript, but the revisions past
this will conflict with thumper's work that I reviewed yesterday, and I don't
want to make the major changes (from the latter revisions) so close to release
time.

Cheers,
Paul

[Graham Binns (gmb)]

review: Approve (code)

=== modified file 'lib/canonical/launchpad/javascript/code/branchlinks.js'
--- lib/canonical/launchpad/javascript/code/branchlinks.js	2009-11-24 09:30:01 +0000
+++ lib/canonical/launchpad/javascript/code/branchlinks.js	2010-03-11 19:22:24 +0000
@@ -7,9 +7,9 @@
  * @requires base, lazr.anim, lazr.formoverlay
  */
 
-YUI.add('code.branchlinks', function(Y) {
+YUI.add('lp.code.branchlinks', function(Y) {
 
-Y.branchlinks = Y.namespace('code.branchlinks');
+var namespace = Y.namespace('lp.code.branchlinks');
 
 var lp_client;          // The LP client
 
@@ -20,7 +20,7 @@
 /*
  * Connect the links to the javascript events.
  */
-Y.branchlinks.connect_branchlinks = function() {
+namespace.connect_branchlinks = function() {
 
     error_handler = new LP.client.ErrorHandler();
     error_handler.clearProgressUI = function() {
@@ -163,7 +163,7 @@
 
                         // Check to see if that was the only bug linked.
                         var buglinks = Y.all(".bug-branch-summary");
-                        if (buglinks.size() == 0) {
+                        if (!buglinks.size()) {
                             Y.one('#linkbug').set('innerHTML',
                                 'Link to a bug report');
                         }

=== modified file 'lib/canonical/launchpad/javascript/code/branchmergeproposal.js'
--- lib/canonical/launchpad/javascript/code/branchmergeproposal.js	2010-02-25 00:39:57 +0000
+++ lib/canonical/launchpad/javascript/code/branchmergeproposal.js	2010-03-11 19:22:24 +0000
@@ -1,19 +1,19 @@
 /** Copyright (c) 2009, Canonical Ltd. All rights reserved.
  *
- * Code for handling the update of the branch status.
+ * Code for handling the update of the branch merge proposals.
  *
- * @module branchstatus
+ * @module lp.code.branchmergeproposal
  * @requires node, lazr.choiceedit, lp.client.plugins
  */
 
-YUI.add('code.branchmergeproposal', function(Y) {
+YUI.add('lp.code.branchmergeproposal', function(Y) {
 
-Y.code.branchmergeproposal = Y.namespace('code.branchmergeproposal');
+var namespace = Y.namespace('lp.code.branchmergeproposal');
 
 /*
  * Connect the branch status to the javascript events.
  */
-Y.code.branchmergeproposal.connect_status = function(conf) {
+namespace.connect_status = function(conf) {
 
     var status_content = Y.get('#branchmergeproposal-status-value');
 

=== modified file 'lib/canonical/launchpad/javascript/code/branchstatus.js'
--- lib/canonical/launchpad/javascript/code/branchstatus.js	2009-11-24 09:30:01 +0000
+++ lib/canonical/launchpad/javascript/code/branchstatus.js	2010-03-11 19:22:24 +0000
@@ -3,18 +3,18 @@
  *
  * Code for handling the update of the branch status.
  *
- * @module branchstatus
+ * @module lp.code.branchstatus
  * @requires node, lazr.choiceedit, lp.client.plugins
  */
 
-YUI.add('code.branchstatus', function(Y) {
+YUI.add('lp.code.branchstatus', function(Y) {
 
-Y.branchstatus = Y.namespace('code.branchstatus');
+var namespace = Y.namespace('lp.code.branchstatus');
 
 /*
  * Connect the branch status to the javascript events.
  */
-Y.branchstatus.connect_status = function(conf) {
+namespace.connect_status = function(conf) {
 
     var status_content = Y.one('#branch-details-status-value');
 

=== modified file 'lib/canonical/launchpad/javascript/code/codereview.js'
--- lib/canonical/launchpad/javascript/code/codereview.js	2010-02-23 09:31:13 +0000
+++ lib/canonical/launchpad/javascript/code/codereview.js	2010-03-11 19:22:24 +0000
@@ -3,13 +3,13 @@
  *
  * Library for code review javascript.
  *
- * @module CodeReview
+ * @module lp.code.codereview
  * @requires base, lazr.anim, lazr.formoverlay
  */
 
-YUI.add('code.codereview', function(Y) {
+YUI.add('lp.code.codereview', function(Y) {
 
-Y.codereview = Y.namespace('code.codereview');
+var namespace = Y.namespace('lp.code.codereview');
 
 var reviewer_picker; // The "Request a review" overlay
 var lp_client;
@@ -23,7 +23,7 @@
 /*
  * Connect all the links to their given actions.
  */
-Y.codereview.connect_links = function() {
+namespace.connect_links = function() {
 
     var link = Y.one('#request-review');
     if (Y.Lang.isValue(link)) {
@@ -51,7 +51,9 @@
 
 function link_scroller(link_selector, node_selector, on_end) {
     var link = Y.one(link_selector);
-    if (!Y.Lang.isValue(link)) return;
+    if (!Y.Lang.isValue(link)) {
+        return;
+    }
 
     link.addClass('js-action');
     link.on('click', function(e) {
@@ -229,7 +231,7 @@
                 var target = Y.one('#votes-target');
                 target.set('innerHTML', response.responseText);
 
-                Y.codereview.connect_links();
+                namespace.connect_links();
                 var new_reviewer = Y.one('#review-' + username);
                 var anim = Y.lazr.anim.green_flash({node: new_reviewer});
                 anim.run();
@@ -276,6 +278,6 @@
     }
 });
 
-Y.codereview.NumberToggle = NumberToggle;
+namespace.NumberToggle = NumberToggle;
 
 }, "0.1", {"requires": ["base", "widget", "lazr.anim", "lazr.formoverlay", "lp.picker"]});

=== modified file 'lib/canonical/launchpad/javascript/code/popupdiff.js'
--- lib/canonical/launchpad/javascript/code/popupdiff.js	2010-02-19 17:04:52 +0000
+++ lib/canonical/launchpad/javascript/code/popupdiff.js	2010-03-11 19:22:24 +0000
@@ -3,11 +3,14 @@
  *
  * Code for handling the popup diffs in the pretty overlays.
  *
- * @module popupdiff
+ * @module lp.code.branchmergeproposal.popupdiff
  * @requires node
  */
 
-YUI.add('code.branchmergeproposal.popupdiff', function(Y) {
+YUI.add('lp.code.branchmergeproposal.popupdiff', function(Y) {
+
+// Grab the namespace in order to be able to expose the connect method.
+var namespace = Y.namespace('lp.code.branchmergeproposal.popupdiff');
 
 // The launchpad js client used.
 var lp_client;
@@ -90,9 +93,6 @@
 }
 
 
-// Grab the namespace in order to be able to expose the connect method.
-var popupdiff = Y.namespace('code.branchmergeproposal.popupdiff');
-
 /*
  * Link up the onclick handler for the a.diff-link in the node to the function
  * that will popup the diff in the pretty overlay.
@@ -113,7 +113,7 @@
 /*
  * Connect the diff links to their pretty overlay function.
  */
-popupdiff.connect_diff_links = function() {
+namespace.connect_diff_links = function() {
     // IE doesn't like pretty overlays.
     if (Y.UA.ie) {
         return;

=== modified file 'lib/canonical/launchpad/javascript/code/subscription.js'
--- lib/canonical/launchpad/javascript/code/subscription.js	2010-01-12 23:44:24 +0000
+++ lib/canonical/launchpad/javascript/code/subscription.js	2010-03-11 19:22:24 +0000
@@ -15,7 +15,7 @@
    along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-YUI.add('code.branch.subscription', function(Y) {
+YUI.add('lp.code.branch.subscription', function(Y) {
 
 /*
  * Tools for working with branch subscriptions.
@@ -24,7 +24,7 @@
  * @namespace lp.code.branch.subscription
  */
 
-var namespace = Y.namespace('code.branch.subscription');
+var namespace = Y.namespace('lp.code.branch.subscription');
 
 var display_name,   // The logged in user's displayname.
     user_name,      // The logged in user's username.
@@ -207,7 +207,7 @@
         Y.on(
             'branch:subscriber-list-stale',
             this._updateSubscribersList);
-    },
+    }
 });
 namespace.SubscriptionWidget = SubscriptionWidget;
 
@@ -215,5 +215,5 @@
     'event',
     'io',
     'lazr.formoverlay',
-    'node',
+    'node'
     ]});

=== modified file 'lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js'
--- lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js	2010-02-16 16:29:36 +0000
+++ lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js	2010-03-11 19:22:24 +0000
@@ -344,7 +344,7 @@
 
          // Now make sure patch() on a field resource works when we
          // request a JSON representation in return.
-         var field_uri = LP.client.get_field_uri('~salgado', 'display_name');
+         field_uri = LP.client.get_field_uri('~salgado', 'display_name');
          client.patch(field_uri, 'Guilherme Salgado',
                       {on: test.create_yui_sync_on()});
      },
@@ -354,7 +354,7 @@
          jum.assertEquals('success', test.result.callback);
          var salgado_name_html = test.result.args[0];
          jum.assertEquals(salgado_name_html, "Guilherme Salgado");
-     },
+     }
 ]);
 
 //Test that modifying an entry and then calling lp_save() saves the

=== modified file 'lib/lp/bugs/templates/bugtask-index.pt'
--- lib/lp/bugs/templates/bugtask-index.pt	2010-01-22 03:16:44 +0000
+++ lib/lp/bugs/templates/bugtask-index.pt	2010-03-11 19:22:24 +0000
@@ -38,10 +38,10 @@
       </tal:devmode>
       <script type="text/javascript">
         LPS.use('base', 'node', 'oop', 'event', 'bugs.bugtask_index',
-                  'code.branchmergeproposal.popupdiff', function(Y) {
+                  'lp.code.branchmergeproposal.popupdiff', function(Y) {
             Y.bugs.setup_bugtask_index();
             Y.on('load', function(e) {
-              Y.code.branchmergeproposal.popupdiff.connect_diff_links();
+              Y.lp.code.branchmergeproposal.popupdiff.connect_diff_links();
             }, window);
         });
       </script>

=== modified file 'lib/lp/code/templates/branch-index.pt'
--- lib/lp/code/templates/branch-index.pt	2010-01-15 20:22:33 +0000
+++ lib/lp/code/templates/branch-index.pt	2010-03-11 19:22:24 +0000
@@ -44,18 +44,18 @@
   <script type="text/javascript"
           tal:content="string:
     LPS.use('node', 'event', 'widget', 'plugin', 'overlay',
-              'lazr.choiceedit', 'code.branchstatus',
-              'code.branchmergeproposal.popupdiff',
-              'code.branch.subscription', function(Y) {
+              'lazr.choiceedit', 'lp.code.branchstatus',
+              'lp.code.branchmergeproposal.popupdiff',
+              'lp.code.branch.subscription', function(Y) {
 
         Y.on('load', function(e) {
-            var subscription_portlet = new Y.code.branch.subscription.SubscriptionWidget({
+            var subscription_portlet = new Y.lp.code.branch.subscription.SubscriptionWidget({
                 contentBox: '#portlet-subscribers'
             });
             subscription_portlet.render();
 
-            Y.branchstatus.connect_status(${view/status_config});
-            Y.code.branchmergeproposal.popupdiff.connect_diff_links();
+            Y.lp.code.branchstatus.connect_status(${view/status_config});
+            Y.lp.code.branchmergeproposal.popupdiff.connect_diff_links();
             },
             window);
     });

=== modified file 'lib/lp/code/templates/branch-related-bugs-specs.pt'
--- lib/lp/code/templates/branch-related-bugs-specs.pt	2009-12-03 18:33:22 +0000
+++ lib/lp/code/templates/branch-related-bugs-specs.pt	2010-03-11 19:22:24 +0000
@@ -42,14 +42,14 @@
     string:&lt;script id='branchlink-script' type='text/javascript'&gt;" />
     <!--
 
-    LPS.use('io-base', 'code.branchlinks', function(Y) {
+    LPS.use('io-base', 'lp.code.branchlinks', function(Y) {
 
     if(Y.UA.ie) {
         return;
     }
 
     Y.on('domready', function() {
-        Y.code.branchlinks.connect_branchlinks();
+        Y.lp.code.branchlinks.connect_branchlinks();
     });
 
     });

=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
--- lib/lp/code/templates/branchmergeproposal-index.pt	2010-02-23 09:31:13 +0000
+++ lib/lp/code/templates/branchmergeproposal-index.pt	2010-03-11 19:22:24 +0000
@@ -228,8 +228,8 @@
   string:&lt;script id='codereview-script' type='text/javascript'&gt;" />
   conf = <tal:status-config replace="view/status_config" />
   <!--
-  LPS.use('io-base', 'code.codereview', 'code.branchmergeproposal', 'lp.comment',
-            function(Y) {
+  LPS.use('io-base', 'lp.code.codereview', 'lp.code.branchmergeproposal',
+          'lp.comment', function(Y) {
 
     Y.on('load', function() {
         var logged_in = LP.client.links['me'] !== undefined;
@@ -242,10 +242,10 @@
                 return;
             }
 
-            Y.code.branchmergeproposal.connect_status(conf);
+            Y.lp.code.branchmergeproposal.connect_status(conf);
         }
-        Y.code.codereview.connect_links();
-        (new Y.codereview.NumberToggle()).render();
+        Y.lp.code.codereview.connect_links();
+        (new Y.lp.code.codereview.NumberToggle()).render();
       }, window);
   });
   -->