commit 4eb992ae18a2f87aa015f88d97840ebaf88a0f46
author Jeff Thompson <jeff@thefirst.org> Sat Mar 09 21:05:53 2013 -0800
committer Jeff Thompson <jeff@thefirst.org> Sat Mar 09 21:05:53 2013 -0800
tree e3e65cd80078be04160fdb7c940495824c27b913
parent 48aa4926c7399cdd4b521673eba80979c503b9df

Move the NDN object from ndnProtocolService to NdnProtocolInfo.

js/ndnProtocol/components/ndnProtocolService.js

diff --git a/js/ndnProtocol/components/ndnProtocolService.js b/js/ndnProtocol/components/ndnProtocolService.js
index 975a6b5..1cac09b 100644
--- a/js/ndnProtocol/components/ndnProtocolService.js
+++ b/js/ndnProtocol/components/ndnProtocolService.js
@@ -16,9 +16,7 @@
 Components.utils.import("chrome://modules/content/ContentChannel.jsm");

 Components.utils.import("chrome://modules/content/NdnProtocolInfo.jsm");

 

-function NdnProtocol() {

-    this.ndn = new NDN({ getTransport: function() { return new XpcomTransport(); }, 

-                       verify: false });

+function NdnProtocol() {    

 }

 

 NdnProtocol.prototype = {

@@ -67,8 +65,6 @@
 

     newChannel: function(aURI)

     {

-        var thisNdnProtocol = this;

-        

         try {            

             var uriParts = NdnProtocolInfo.splitUri(aURI.spec);

     

@@ -86,8 +82,8 @@
             var requestContent = function(contentListener) {                

                 var name = new Name(uriParts.name);

                 // Use the same NDN object each time.

-                thisNdnProtocol.ndn.expressInterest(name, new ExponentialReExpressClosure 

-                    (new ContentClosure(thisNdnProtocol.ndn, contentListener, name, 

+                NdnProtocolInfo.ndn.expressInterest(name, new ExponentialReExpressClosure 

+                    (new ContentClosure(NdnProtocolInfo.ndn, contentListener, name, 

                             aURI, searchWithoutNdn + uriParts.hash, segmentTemplate)),

                     template);

             };