Bug 436659 - The description of Feed View is not displayed. r=mano
authorGavin Sharp <gavin.sharp@gmail.com>
Sat, 07 Feb 2009 12:43:09 +0100
changeset 24731 ca6426f959b380c30e1bc16ca14646daa5b8f38f
parent 24730 98fe21ddf417f997d6c17b2024f58526350ae791
child 24732 b395701ced5015012f16fe3115c96640383cde40
push idunknown
push userunknown
push dateunknown
reviewersmano
bugs436659
milestone1.9.2a1pre
Bug 436659 - The description of Feed View is not displayed. r=mano
browser/components/feeds/content/subscribe.xhtml
browser/components/feeds/src/FeedWriter.js
--- a/browser/components/feeds/content/subscribe.xhtml
+++ b/browser/components/feeds/content/subscribe.xhtml
@@ -25,19 +25,20 @@
           type="text/css"
           media="all"/>
     <script type="application/x-javascript"
             src="chrome://browser/content/feeds/subscribe.js"/>
   </head>
   <body onload="SubscribeHandler.writeContent();" onunload="SubscribeHandler.uninit();">
     <div id="feedHeaderContainer">
       <div id="feedHeader" dir="&locale.dir;">
-        <div id="feedIntroText"
-          ><xul:description id="feedSubscriptionInfo1" /><xul:description id="feedSubscriptionInfo2"
-        /></div>
+        <div id="feedIntroText">
+          <p id="feedSubscriptionInfo1" />
+          <p id="feedSubscriptionInfo2" />
+        </div>
 
 <!-- XXXmano this can't have any whitespace in it.  Otherwise you would see
      how much XUL-in-XHTML sucks, see bug 348830 -->
         <div id="feedSubscribeLine"
           ><xul:vbox
             ><xul:hbox align="center" 
               ><xul:description id="subscribeUsingDescription"
               /><xul:menulist id="handlersMenuList" aria-labelledby="subscribeUsingDescription"
--- a/browser/components/feeds/src/FeedWriter.js
+++ b/browser/components/feeds/src/FeedWriter.js
@@ -1109,18 +1109,18 @@ FeedWriter.prototype = {
 
       this._contentSandbox.feedinfo1 =
         this._document.getElementById("feedSubscriptionInfo1");
       this._contentSandbox.feedinfo1Str = this._getString(textfeedinfo1);
       this._contentSandbox.feedinfo2 =
         this._document.getElementById("feedSubscriptionInfo2");
       this._contentSandbox.feedinfo2Str = this._getString(textfeedinfo2);
       this._contentSandbox.header = header;
-      codeStr = "feedinfo1.value = feedinfo1Str; " +
-                "feedinfo2.value = feedinfo2Str; " +
+      codeStr = "feedinfo1.textContent = feedinfo1Str; " +
+                "feedinfo2.textContent = feedinfo2Str; " +
                 "header.setAttribute('firstrun', 'true');"
       Cu.evalInSandbox(codeStr, this._contentSandbox);
       prefs.setBoolPref(PREF_SHOW_FIRST_RUN_UI, false);
     }
   },
 
   /**
    * Returns the original URI object of the feed and ensures that this