Bindwood

Merge lp:~chrisccoulson/bindwood/ff6-compat into lp:bindwood

  1. ff6-compat
  2. Merge into trunk
Proposed by Chris Coulson
Status: Merged
Approved by: dobey
Approved revision: 46
Merged at revision: 44
Proposed branch: lp:~chrisccoulson/bindwood/ff6-compat
Merge into: lp:bindwood
Diff against target: 28 lines (+3/-4)
2 files modified
install.rdf (+1/-1)
modules/couch.jsm (+2/-3)
To merge this branch: bzr merge lp:~chrisccoulson/bindwood/ff6-compat
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+68906@code.launchpad.net

Commit message

Bump compat to 6.0.*
class is a reserved keyword in JS

Description of the change

Fixes an exception in Firefox 5.0

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

Hooray!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install.rdf'
2--- install.rdf 2011-03-09 01:46:26 +0000
3+++ install.rdf 2011-07-22 20:41:46 +0000
4@@ -18,7 +18,7 @@
5 <Description>
6 <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
7 <em:minVersion>3.5</em:minVersion>
8- <em:maxVersion>4.0.*</em:maxVersion>
9+ <em:maxVersion>6.0.*</em:maxVersion>
10 </Description>
11 </em:targetApplication>
12
13
14=== modified file 'modules/couch.jsm'
15--- modules/couch.jsm 2011-02-28 15:24:11 +0000
16+++ modules/couch.jsm 2011-07-22 20:41:46 +0000
17@@ -13,9 +13,8 @@
18 var EXPORTED_SYMBOLS = ["CouchDB", "XMLHttpRequest"];
19
20 var XMLHttpRequest = function () {
21- var class = "@mozilla.org/xmlextras/xmlhttprequest;1";
22- var service = Components.interfaces.nsIXMLHttpRequest;
23- return Components.classes[class].getService(service);
24+ return Components.classes["@mozilla.org/xmlextras/xmlhttprequest;1"].
25+ getService(Components.interfaces.nsIXMLHttpRequest);
26 }
27
28 // A simple class to represent a database. Uses XMLHttpRequest to interface with

Subscribers

People subscribed via source and target branches