Merge lp:~jtv/launchpad/bmp-inline-diffs into lp:~spiv/launchpad/bmp-inline-diffs

[Jeroen T. Vermeulen]

ajax_revision_diffs feature flag.

Protect the Ajax expandable inline revision diffs with a feature flag.

To enable this, add a feature rule along the lines of
{{{
code.ajax_revision_diffs.enabled default 1 on
}}}

Also, I removed the js-action CSS class from the expander icon tags. The expander widget now adds this class automatically.

The expander widget itself is currently on approach for landing.

Jeroen

[Andrew Bennetts (spiv)]

Thanks!

=== modified file 'lib/lp/code/templates/branch-macros.pt'
--- lib/lp/code/templates/branch-macros.pt	2011-06-30 17:03:35 +0000
+++ lib/lp/code/templates/branch-macros.pt	2011-07-01 12:14:31 +0000
@@ -202,19 +202,22 @@
                   condition="revisions | nothing">
         <metal:landing-target use-macro="branch/@@+macros/revision-text"/>
     </tal:revision>
-    <tal:diff-expander condition="show_diff_expander | nothing">
-      <div class="revision-group-diff" tal:condition="revisions | nothing">
-        <a class="unseen expander-icon js-action"
-           tal:define="start_revno python:revisions[0].sequence;
-                       last_revno python:revisions[-1].sequence"
-           tal:attributes="id string:expandable-${start_revno}-${last_revno}"
-        >Changes added by revision <tal:revno replace="start_revno">1</tal:revno>
-          <tal:plural condition="python: start_revno!=last_revno">
-            to revision <tal:revno replace="last_revno">2</tal:revno>
-          </tal:plural></a>
-      <div class="unseen expander-content">Loading diff</div>
-      </div>
-    </tal:diff-expander>
+    <tal:ajax-revision-diffs
+        condition="request/features/code.ajax_revision_diffs.enabled">
+      <tal:diff-expander condition="show_diff_expander | nothing">
+	<div class="revision-group-diff" tal:condition="revisions | nothing">
+	  <a class="unseen expander-icon"
+	     tal:define="start_revno python:revisions[0].sequence;
+			 last_revno python:revisions[-1].sequence"
+	     tal:attributes="id string:expandable-${start_revno}-${last_revno}"
+	  >Changes added by revision <tal:revno replace="start_revno">1</tal:revno>
+	    <tal:plural condition="python: start_revno!=last_revno">
+	      to revision <tal:revno replace="last_revno">2</tal:revno>
+	    </tal:plural></a>
+	<div class="unseen expander-content">Loading diff</div>
+	</div>
+      </tal:diff-expander>
+    </tal:ajax-revision-diffs>
   </dl>
 
 </metal:branch-revisions>
@@ -268,8 +271,10 @@
       The revision commit message.
     </tal:commit-message>
   </dd>
-  <div class="revision-expander">
-    <a class="unseen expander-icon js-action"
+  <div
+      class="revision-expander"
+      tal:condition="request/features/code.ajax_revision_diffs.enabled">
+    <a class="unseen expander-icon"
        tal:attributes="id string:expandable-${rev_no/sequence}"
      >Changes</a>
     <div class="unseen expander-content">

=== modified file 'lib/lp/services/features/flags.py'
--- lib/lp/services/features/flags.py	2011-06-16 13:50:58 +0000
+++ lib/lp/services/features/flags.py	2011-07-01 12:14:31 +0000
@@ -42,6 +42,10 @@
      'boolean',
      ('Enables the display of bugtracker components.'),
      ''),
+    ('code.ajax_revision_diffs',
+     'boolean',
+     ("Offer expandable inline diffs for branch revisions."),
+     ''),
     ('code.branchmergequeue',
      'boolean',
      'Enables merge queue pages and lists them on branch pages.',