[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/khtml/html
From:       Maks Orlovich <maksim () kde ! org>
Date:       2010-06-09 19:57:08
Message-ID: 20100609200415.CABD2AC8CF () svn ! kde ! org
[Download RAW message or body]

SVN commit 1136434 by orlovich:

Make sure we set the title on stylesheets for <link> and <style> as well. Fixes etherpad text not 
showing up.



 M  +8 -0      html_headimpl.cpp  


--- trunk/KDE/kdelibs/khtml/html/html_headimpl.cpp #1136433:1136434
@@ -129,6 +129,8 @@
     case ATTR_TITLE:
         // ### when title changes we have to reconsider our alternative
         // stylesheet choice
+        if (m_sheet)
+            m_sheet->setTitle(attr->value());
         break;
     case ATTR_MEDIA:
         m_media = attr->value().string().toLower();
@@ -257,6 +259,7 @@
     m_sheet->ref();
     m_sheet->setCharset(charset);
     m_sheet->parseString( sheet, strict );
+    m_sheet->setTitle(getAttribute(ATTR_TITLE));
 
     MediaListImpl *media = new MediaListImpl( (CSSStyleSheetImpl*)0, m_media );
     m_sheet->setMedia( media );
@@ -660,6 +663,10 @@
     case ATTR_MEDIA:
         m_media = attr->value().string().toLower();
         break;
+    case ATTR_TITLE:
+        if (m_sheet)
+            m_sheet->setTitle(attr->value());
+        break;
     default:
         HTMLElementImpl::parseAttribute(attr);
     }
@@ -722,6 +729,7 @@
             m_sheet->ref();
             m_sheet->parseString( text, !document()->inCompatMode() );
             m_sheet->setMedia( media );
+            m_sheet->setTitle( getAttribute(ATTR_TITLE) );
             m_loading = false;
         }
         media->deref();
[prev in list] [next in list] [prev in thread] [next in thread]