Ubufox Extension

Merge lp://qastaging/~micahg/ubufox/fix.lp522535 into lp://qastaging/~asac/ubufox/main

  1. fix.lp522535
  2. Merge into main
Proposed by Micah Gersten
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~micahg/ubufox/fix.lp522535
Merge into: lp://qastaging/~asac/ubufox/main
Diff against target: 65 lines (+17/-11)
1 file modified
content/overlay.js (+17/-11)
To merge this branch: bzr merge lp://qastaging/~micahg/ubufox/fix.lp522535
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+19540@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2010-02-16.

To post a comment you must log in.
Revision history for this message
Micah Gersten (micahg) wrote : Posted in a previous version of this proposal

This should allow firefox to be unversioned in 3.6 and up. We also have the flexibility to have a firefox-next if we want at a later date. This should be pushed, IMHO, in a coordinated effort with the Rosetta template rename as that's the only currently versioned part of Firefox 3.6

Revision history for this message
Alexander Sack (asac) wrote : Posted in a previous version of this proposal

this isnt fully correct.

firefox 3.7 is still versioned?

also there are more uses of getAppVersion ... we might want to do a getLpSourceName() which returns firefox if app version = null and otherwise firefox-getAppVersion().

for example:

function ubufoxGetHelpOnline(event)
{
  var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+gethelp";
  openUILink(getHelpUrl, event, false, true);
}

function ubufoxHelpTranslateLaunchpad(event)
{
  var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+translate";
  openUILink(translateUrl, event, false, true);
}

is now wrong ... this needs to be fixed too

look for other uses of getAppVersion too

Revision history for this message
Alexander Sack (asac) : Posted in a previous version of this proposal
review: Needs Fixing
Revision history for this message
Micah Gersten (micahg) wrote :

Firefox 3.7 isn't in archive and won't work for translations/bugs/questions at the moment anyways. This will allow us to add a firefox-next (or whatever the channel is called) when it happens.

lp://qastaging/~micahg/ubufox/fix.lp522535 updated
200. By Micah Gersten

* fix LP: #522535 - Apport doesn't recognise Firefox 3.6; add
  getSourcePackageName(); update getAppVersion() to reflect unversioned
  Firefox 3.6
  - update content/overlay.js

Revision history for this message
Micah Gersten (micahg) wrote :

Merge updated with a new function.

Revision history for this message
Alexander Sack (asac) wrote :

collapsed line 61 and 62 as that was redundant and merged.... thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'content/overlay.js'
2--- content/overlay.js 2010-02-17 19:15:28 +0000
3+++ content/overlay.js 2010-02-21 07:56:16 +0000
4@@ -43,20 +43,29 @@
5 }
6
7 if (versionString == null)
8- return NULL;
9+ return null;
10
11 if (String_startsWith (versionString, "3.0"))
12 versionString = "3.0";
13 else if (String_startsWith (versionString, "3.5"))
14 versionString = "3.5";
15- else if (String_startsWith (versionString, "3.6"))
16- versionString = "3.6";
17- else if (String_startsWith (versionString, "3.7"))
18- versionString = "3.7";
19+ else // Return null for > 3.6 as firefox is unversioned now
20+ versionString = null;
21
22 return versionString;
23 }
24
25+function getSourcePackageName ()
26+{
27+ var sourcePackageName = "firefox";
28+ var versionString = null;
29+ versionString = getAppVersion();
30+ if (versionString)
31+ sourcePackageName = sourcePackageName + "-" + versionString;
32+
33+ return sourcePackageName;
34+}
35+
36 var ubufox = {
37 onAddonsLoad: function () {
38 this.isffox3 = false;
39@@ -157,10 +166,7 @@
40 procUtil.init(executable);
41
42 var args = null;
43- if (getAppVersion())
44- args = new Array("-p", "firefox-" + getAppVersion());
45- else
46- args = new Array("-p", "firefox" );
47+ args = new Array("-p", getSourcePackageName());
48
49 var res = procUtil.run(false, args, args.length);
50 }
51@@ -168,13 +174,13 @@
52
53 function ubufoxGetHelpOnline(event)
54 {
55- var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+gethelp";
56+ var getHelpUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+gethelp";
57 openUILink(getHelpUrl, event, false, true);
58 }
59
60 function ubufoxHelpTranslateLaunchpad(event)
61 {
62- var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/firefox-" + getAppVersion () + "/+translate";
63+ var translateUrl = "https://launchpad.net/distros/ubuntu/lucid/+sources/" + getSourcePackageName() + "/+translate";
64 openUILink(translateUrl, event, false, true);
65 }
66

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: