/pkg-bazaar/loggerhead/unstable

Index: unstable/loggerhead/templates/macros.pt

===================================================================

--- unstable.orig/loggerhead/templates/macros.pt

+++ unstable/loggerhead/templates/macros.pt

@@ -23,22 +23,6 @@

     <script type="text/javascript"

             tal:attributes="src python:branch.yui_url('yui/yui-min.js')"></script>

     <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('oop/oop-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('event/event-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('attribute/attribute-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('base/base-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('dom/dom-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('node/node-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('anim/anim-min.js')"></script>

-    <script type="text/javascript"

-            tal:attributes="src python:branch.yui_url('io/io-base-min.js')"></script>

-    <script type="text/javascript"

             tal:attributes="src python:branch.static_url('/static/javascript/custom.js')"></script>

     <metal:block metal:define-slot="header_extras" />

   </head>

Index: unstable/loggerhead/static/javascript/custom.js

===================================================================

--- unstable.orig/loggerhead/static/javascript/custom.js

+++ unstable/loggerhead/static/javascript/custom.js

@@ -1,13 +1,14 @@

-Y = YUI().use("base", "node", "io-base", "anim");

-

 var global_timeout_id = null;

 var global_search_request = null;

+LH = new YUI();

+LH.use("base", "event", "node", "io-base", "anim", function (Y) {

+

 Y.on(

   'domready',

   function()

   {

-    var search_box = Y.get('#q');

+    var search_box = Y.one('#q');

     if (!Y.Lang.isNull(search_box))

     {

       function get_suggestions() {

@@ -29,11 +30,11 @@

         var region = search_box.get('region');

         var current_query = search_box.get('value');

-        Y.get('#search_terms').setStyle('display', 'block');

-        Y.get('#search_terms').setStyle('position', 'absolute');

-        Y.get('#search_terms').setStyle('left', region.left);

-        Y.get('#search_terms').setStyle('top', region.bottom);

-        Y.get('#search_terms').set('innerHTML','Loading...');

+        Y.one('#search_terms').setStyle('display', 'block');

+        Y.one('#search_terms').setStyle('position', 'absolute');

+        Y.one('#search_terms').setStyle('left', region.left);

+        Y.one('#search_terms').setStyle('top', region.bottom);

+        Y.one('#search_terms').set('innerHTML','Loading...');

       }

       search_box.on(

         "keyup",

@@ -41,7 +42,7 @@

         {

           if(search_box.get('value') == '')

           {

-            Y.get('#search_terms').setStyle('display', 'none');

+            Y.one('#search_terms').setStyle('display', 'none');

           }

           else

           {

@@ -53,29 +54,30 @@

           }

         });

     }

-  });

+  }

+);

 function cool_search(tid, response, query)

 {

-  var q = Y.get('#q');

+  var q = Y.one('#q');

   var region = q.get('region');

   var current_query = q.get('value');

   if (current_query == query)

   {

-    Y.get('#search_terms').set('innerHTML', response.responseText);

-    Y.get('#search_terms').setStyle('display', 'block');

-    Y.get('#search_terms').setStyle('position', 'absolute');

-    Y.get('#search_terms').setStyle('left', region.left);

-    Y.get('#search_terms').setStyle('top', region.bottom);

+    Y.one('#search_terms').set('innerHTML', response.responseText);

+    Y.one('#search_terms').setStyle('display', 'block');

+    Y.one('#search_terms').setStyle('position', 'absolute');

+    Y.one('#search_terms').setStyle('left', region.left);

+    Y.one('#search_terms').setStyle('top', region.bottom);

   }

 }

 function hide_search()

 {

-  setTimeout("Y.get('#search_terms').setStyle('display','none')", 300);

+  setTimeout("Y.one('#search_terms').setStyle('display','none')", 300);

 }

-function Collapsable(config)

+LH.Collapsable = function(config)

 {

   this.is_open = config.is_open;

   this.open_node = config.open_node;

@@ -100,7 +102,7 @@

   return height;

 }

-Collapsable.prototype._animate = function (callback)

+LH.Collapsable.prototype._animate = function (callback)

 {

   if (this.anim) this.anim.stop();

@@ -120,7 +122,7 @@

   this.anim.on('end', this.animComplete, this, callback);

 }

-Collapsable.prototype._load_finished = function(tid, res, args)

+LH.Collapsable.prototype._load_finished = function(tid, res, args)

 {

   var l = res.responseText.split('\n');

   l.splice(0, 1);

@@ -137,7 +139,7 @@

   this._animate(args[0]);

 };

-Collapsable.prototype._ensure_container = function(callback)

+LH.Collapsable.prototype._ensure_container = function(callback)

 {

   if (this.container == null) {

     this.container = Y.Node.create('<div></div>');

@@ -184,7 +186,7 @@

  * 8. Start a new animation to show the rest of the new content.

  */

-Collapsable.prototype.open = function(callback)

+LH.Collapsable.prototype.open = function(callback)

 {

   this.expand_icon.set('src', expanded_icon_path);

@@ -221,7 +223,7 @@

 };

-Collapsable.prototype.animComplete = function(evt, callback)

+LH.Collapsable.prototype.animComplete = function(evt, callback)

 {

   this.anim = null;

   if (this._loading) return;

@@ -229,7 +231,7 @@

   this.is_open = true;

 };

-Collapsable.prototype.close = function()

+LH.Collapsable.prototype.close = function()

 {

   this._ensure_container();

@@ -258,7 +260,7 @@

   anim.run();

 };

-Collapsable.prototype.closeComplete = function () {

+LH.Collapsable.prototype.closeComplete = function () {

   this.open_node.setStyle('display', 'none');

   if (this.close_node) {

     this.close_node.setStyle('display', 'block');

@@ -268,7 +270,7 @@

   this.is_open = false;

 };

-Collapsable.prototype.toggle = function()

+LH.Collapsable.prototype.toggle = function()

 {

   if (this.is_open)

   {

@@ -305,7 +307,7 @@

         }

     }

     var id_selector = "#" + target_id;

-    var main = Y.get(id_selector);

+    var main = Y.one(id_selector);

     notification_node = Y.Node.create('<div></div>')

         .addClass('global-notification');

     if (hidden) {

@@ -324,13 +326,13 @@

      this is because we have no way to use feature flags in

      css directly. This should be removed if the feature

      is accepted. */

-    var body = Y.get('body');

+    var body = Y.one('body');

     body.addClass('feature-flag-bugs-private-notification-enabled');

     // Set the visible flag so that the content moves down.

     body.addClass('global-notification-visible');

     setup_privacy_notification();

-    var global_notification = Y.get('.global-notification');

+    var global_notification = Y.one('.global-notification');

     if (global_notification.hasClass('hidden')) {

         global_notification.addClass('transparent');

         global_notification.removeClass('hidden');

@@ -360,9 +362,10 @@

 };

 Y.on('domready', function() {

-    var body = Y.get('body');

+    var body = Y.one('body');

     if (body.hasClass('private')) {

         setup_privacy_notification();

         display_privacy_notification();

     }

 });

+});

Index: unstable/loggerhead/static/javascript/diff.js

===================================================================

--- unstable.orig/loggerhead/static/javascript/diff.js

+++ unstable/loggerhead/static/javascript/diff.js

@@ -1,5 +1,7 @@

 var unified = true;

+LH.use("event", function(Y) {

+

 function make_unified(chunk) {

   var pending_added = [];

   function flush_adds(before) {

@@ -91,12 +93,12 @@

   if (unified) {

     pts && pts.each(make_sbs);

     unified = false;

-    Y.get("#toggle_unified_sbs").set('innerHTML', "Show unified diffs");

+    Y.one("#toggle_unified_sbs").set('innerHTML', "Show unified diffs");

   }

   else {

     pts && pts.each(make_unified);

     unified = true;

-    Y.get("#toggle_unified_sbs").set('innerHTML', "Show diffs side-by-side");

+    Y.one("#toggle_unified_sbs").set('innerHTML', "Show diffs side-by-side");

   }

 }

@@ -112,14 +114,14 @@

       var collapsable = item.collapsable;

       if(action == 'close')

       {

-        Y.get('#expand_all').setStyle('display','block');

-        Y.get('#collapse_all').setStyle('display','none');

+        Y.one('#expand_all').setStyle('display','block');

+        Y.one('#collapse_all').setStyle('display','none');

         collapsable.close();

       }

       else if(action == 'open')

       {

-        Y.get('#expand_all').setStyle('display','none');

-        Y.get('#collapse_all').setStyle('display','block');

+        Y.one('#expand_all').setStyle('display','none');

+        Y.one('#collapse_all').setStyle('display','block');

         collapsable.open();

       }

     });

@@ -150,7 +152,7 @@

 }

 function zoom_to_diff (path) {

-  var collapsable = Y.get('#' + path_to_id[path]).collapsable;

+  var collapsable = Y.one('#' + path_to_id[path]).collapsable;

   if (!collapsable.is_open) {

     collapsable.open(

       function () {

@@ -180,21 +182,22 @@

         var source_url = null;

         if (!specific_path)

           source_url = global_path + '+filediff/' + link_data[item.get('id')];

-        item.query('.the-link').on(

+        item.one('.the-link').on(

           'click',

           function(e) {

             e.preventDefault();

             collapsable.toggle();

           });

-        var collapsable = new Collapsable(

+        var collapsable = new LH.Collapsable(

           {

-            expand_icon: item.query('.expand_diff'),

-            open_node: item.query('.diffinfo'),

+            expand_icon: item.one('.expand_diff'),

+            open_node: item.one('.diffinfo'),

             close_node: null,

             source: source_url,

             is_open: specific_path != null,

-            loading: item.query('.loading'),

-            node_process: node_process

+            loading: item.one('.loading'),

+            node_process: node_process,

+	    Y: Y

           });

        item.collapsable=collapsable;

        });

@@ -202,3 +205,4 @@

       zoom_to_diff(window.location.hash.substring(1));

     }

   });

+});

Index: unstable/loggerhead/static/javascript/changelog.js

===================================================================

--- unstable.orig/loggerhead/static/javascript/changelog.js

+++ unstable/loggerhead/static/javascript/changelog.js

@@ -1,3 +1,4 @@

+LH.use('node', 'event', function (Y) {

 function toggle_expand_all(action)

 {

   var revlogs = Y.all('.revision_log');

@@ -8,14 +9,14 @@

       var collapsable = item.collapsable;

       if(action == 'close')

       {

-        Y.get('#expand_all').setStyle('display','block');

-        Y.get('#collapse_all').setStyle('display','none');

+        Y.one('#expand_all').setStyle('display','block');

+        Y.one('#collapse_all').setStyle('display','none');

         collapsable.close();

       }

       else if(action == 'open')

       {

-        Y.get('#expand_all').setStyle('display','none');

-        Y.get('#collapse_all').setStyle('display','block');

+        Y.one('#expand_all').setStyle('display','none');

+        Y.one('#collapse_all').setStyle('display','block');

         collapsable.open();

       }

     });

@@ -54,17 +55,17 @@

       function(item, i)

       {

         var revid = revids[item.get('id').replace('log-', '')];

-        var collapsable = new Collapsable(

+        var collapsable = new LH.Collapsable(

           {

-            expand_icon: item.query('.expand_icon'),

-            open_node: item.query('.long_description'),

-            close_node: item.query('.short_description'),

+            expand_icon: item.one('.expand_icon'),

+            open_node: item.one('.long_description'),

+            close_node: item.one('.short_description'),

             source: global_path + '+revlog/' + revid,

-            loading: item.query('.loading'),

+            loading: item.one('.loading'),

             is_open: false

           });

-        item.query('.expand_revisioninfo a').on(

+        item.one('.expand_revisioninfo a').on(

           'click',

           function(e) {

             e.preventDefault();

@@ -74,3 +75,4 @@

       });

   });

+});

Index: unstable/loggerhead/apps/branch.py

===================================================================

--- unstable.orig/loggerhead/apps/branch.py

+++ unstable/loggerhead/apps/branch.py

@@ -121,7 +121,7 @@

     def yui_url(self, path):

         if self.use_cdn:

-            base = 'http://yui.yahooapis.com/3.0.0pr2/build/'

+            base = 'http://yui.yahooapis.com/3.5.1/build/'

         else:

             base = self.static_url('/static/javascript/yui/build/')

         return base + path