1.0rc11
authorivanl
Wed, 29 Jul 2009 10:14:37 +0100
changeset 15 5e64ec5b1dfe
parent 14 631ddb2767c7
child 16 6544cc5386ce
1.0rc11 Fixes feed parsing problems Cleanup of dead code
Symbian.org/FeedUpdateBroker.js
Symbian.org/Main.js
--- a/Symbian.org/FeedUpdateBroker.js	Tue Jul 21 14:33:23 2009 +0100
+++ b/Symbian.org/FeedUpdateBroker.js	Wed Jul 29 10:14:37 2009 +0100
@@ -165,56 +165,15 @@
 			if (buf != "") {
 				buf += " ";
 			}
-			buf += child.textContent;
-//				buf += doEscapeLtGt(child.nodeValue);
+			buf += child.nodeValue;
 		}
 		child = child.nextSibling;
 	}
 	
 	return buf;
-//    // strip all tags from the buffer
-//    var strippedBuf = "";
-//    var textStartPos = -1;
-//    var tagBalance = 0;
-//	
-//    var pos;
-//    // iterate through the text and append all text to the stripped buffer
-//    // that is at a tag balance of 0
-//    for (pos = 0; pos < buf.length; pos++) {
-//        var c = buf.charAt(pos);
-//        if (c == '<') {
-//            // entering a tag
-//            if (tagBalance == 0 && textStartPos != -1) {
-//                // everything up to here was valid text
-//                strippedBuf += buf.substring(textStartPos, pos);
-//                textStartPos = -1;
-//            }
-//            tagBalance++;
-//        } else if (c == '>') {
-//            // leaving a tag
-//            tagBalance--;
-//            textStartPos = -1;
-//        } else if (tagBalance == 0 && textStartPos == -1) {
-//            // first char of text
-//            textStartPos = pos;
-//        }
-//    }
-//    
-//    // add remaining text - if any
-//    if (tagBalance == 0 && textStartPos != -1) {
-//        strippedBuf += buf.substring(textStartPos, pos);
-//    }
-    
-//    return strippedBuf;
 }
 
 FeedUpdateBroker.prototype.cancel = function() {
 	this.cancelled = true;
 	this.httpReq.abort();
 }
-
-function doEscapeLtGt(text){
-	var lt = "&lt;";
-	var gt = "&gt;";
-	return text.replace(/</g, lt).replace(/>/g, gt);
-}
--- a/Symbian.org/Main.js	Tue Jul 21 14:33:23 2009 +0100
+++ b/Symbian.org/Main.js	Wed Jul 29 10:14:37 2009 +0100
@@ -51,7 +51,7 @@
 var wikiBaseUrl = symbianOrgBaseUrl+"/wiki/index.php";
 
 // Update variables
-var myversion = "1.0rc10";
+var myversion = "1.0rc11";
 var versionWikiPageUrl = wikiBaseUrl + "/Symbian.org_WRT_Widget";
 var versionWikiPageString = "Current widget version is [";
 var downloadUrl = symbianOrgBaseUrl + "/wiki/images/c/c5/Symbian.org.wgz";