Merge lp:~abentley/launchpad/hide-numbers into lp:launchpad
Proposed by
Aaron Bentley
Status: | Merged |
---|---|
Approved by: | Brad Crittenden |
Approved revision: | no longer in the source branch. |
Merged at revision: | not available |
Proposed branch: | lp:~abentley/launchpad/hide-numbers |
Merge into: | lp:launchpad |
Diff against target: |
114 lines 4 files modified
Makefile (+6/-1) configs/development/launchpad-lazr.conf (+4/-0) lib/canonical/launchpad/javascript/code/codereview.js (+34/-1) lib/lp/code/templates/branchmergeproposal-index.pt (+10/-4) |
To merge this branch: | bzr merge lp:~abentley/launchpad/hide-numbers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | ui | Approve | |
Paul Hummer (community) | ui | Approve | |
Brad Crittenden (community) | Approve | ||
Review via email:
|
Commit message
Allow hiding diff line numbers.
To post a comment you must log in.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
= Summary =
Partial fix for #382561: Provide the ability to show and hide line
numbers in the preview diff, using a checkbox.
Note that a fully-functional workaround for #382561 is to use the
"Download diff" link.
== Proposed fix ==
== Pre-implementation notes ==
Pre-implementation was with Thumper
== Implementation details ==
The config and Makefile changes were done so that it was possible to
generate a diff in the developer environment.
The checkbox is implemented as a Widget called NumberToggle.
== Tests ==
None
== Demo and Q/A ==
Create a merge proposal with a diff. Click the checkbox (or the
phrase) "Show line numbers".
= Launchpad lint =
Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.
Linting changed files: code/templates/ branchmergeprop osal-index. pt /launchpad/ javascript/ code/codereview .js development/ launchpad- lazr.conf
lib/lp/
lib/canonical
Makefile
configs/
== JSLint notices == abentley/ launchpad/ hide-numbers/ lib/canonical/ launchpad/ javascript/ bugs/bugtask- index.js' :
No handlers could be found for logger "bzr"
jslint: Lint found in
'/home/
Line 584 character 31: ['api_uri'] is better written in dot notation.
var branch_url = data['api_uri'];
^^^ I didn't change this file!
jslint: No problem found in abentley/ launchpad/ hide-numbers/ lib/canonical/ launchpad/ javascript/ code/codereview .js'.
'/home/
jslint: 2 files to lint. enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkr l+fcACgkQ0F+ nu1YWqI2KtACePS XRjpjFE1lfIwppl 6QLmBe2 rxXsiGRCPimxEwg Hp
gmoAnRNlwDgwMDW
=5eM5
-----END PGP SIGNATURE-----