After sending the content to the ContentChannel, set the mostRecentWindow URL bar if its LOAD_INITIAL_DOCUMENT_URI bit is set.
Thie fixes a bug where sometimes the consumer of the ContentChannel wouldn't set the URL.
diff --git a/js/ccnxProtocol/modules/ndn-js.jsm b/js/ccnxProtocol/modules/ndn-js.jsm
index 8134e79..39c7661 100644
--- a/js/ccnxProtocol/modules/ndn-js.jsm
+++ b/js/ccnxProtocol/modules/ndn-js.jsm
@@ -2548,10 +2548,8 @@
length) {
- if ((null == blob) || (length == 0)) {
-
+ if (null == blob)
return;
- }
if(LOG>4) console.log('LENGTH OF XML_BLOB IS '+length);
@@ -3159,15 +3157,10 @@
BinaryXMLDecoder.prototype.decodeTypeAndVal = function() {
- /*int*/next;
- /*int*/type = -1;
- /*long*/val = 0;
- /*boolean*/more = true;
+ /*int*/var type = -1;
+ /*long*/var val = 0;
+ /*boolean*/var more = true;
-
- //var savedOffset = this.offset;
- var count = 0;
-
do {
var next = this.istream[this.offset ];
@@ -3249,14 +3242,11 @@
//
//byte []
- bytes = this.istream.slice(this.offset, this.offset+ blobLength);
+ var bytes = this.istream.slice(this.offset, this.offset+ blobLength);
this.offset += blobLength;
//int
return bytes;
-
- count = 0;
-
};
var count =0;