76663 2004-03-03 17:20:36 +0000 Insert tag from Files tree does not respect attribute quotation setting 2004-03-03 19:12:43 +0000 1 1 10 Unmaintained quanta general unspecified unspecified Linux RESOLVED FIXED NOR normal --- 0 dennis amantia 0 oldest_to_newest 211920 0 dennis 2004-03-03 17:20:36 +0000 Version: 3.3 Bleeding Edge (2004-03-01) (using KDE 3.2.0, compiled sources) Compiler: gcc version 3.2.2 (Mandrake Linux 9.1 3.2.2-3mdk) OS: Linux (i686) release 2.4.21-0.27mdk If I right RMB click a file in the Files Tree and choose "Insert Tag" it does not respect my single quote attribute setting from quanta, it will always insert in double quotes, I get for example this <a href="file.php"></a> instead of <a href='file.php'></a> 211944 1 dennis 2004-03-03 18:28:18 +0000 Attached is a patch that fixes this. Should be good untill someone complains about it not respecting the tag case - uppercase/lowercase :-) This patch take cares of the quote attribute for <a> and <img> tags they both had the same problem. Created an attachment (id=5003) quote-tag-attribute.patch 211950 2 amantia 2004-03-03 18:49:44 +0000 I'm on my way to create a patch that takes care also of tag/attribute case. ;-) It's compiling right now here. 211953 3 dennis 2004-03-03 18:58:12 +0000 Sounds good ! Next time I won't bug report before I got the fix made myself if I can - you're so quick :-) 211959 4 amantia 2004-03-03 19:12:42 +0000 CVS commit by amantia: Use the correct quotation and case when inserting a link to a file from the treeviews [#76663] Don't you want to subscribe to our devel list? See https://mail.kde.org/mailman/listinfo/quanta-devel. CCMAIL: 76663-done@bugs.kde.org M +1 -0 ChangeLog 1.238 M +18 -4 src/quanta.cpp 1.437 M +8 -0 utility/quantacommon.cpp 1.80 M +3 -0 utility/quantacommon.h 1.64 --- kdewebdev/quanta/ChangeLog #1.237:1.238 @@ -44,4 +44,5 @@ - background parsing: allow user input while parsing [#63000 and its duplicates] - load DTEPs only on demand: improves startup performance, uses less memory + - use the correct quotation and case when inserting a link to a file from the treeviews [#76663] - behavioral changes: - new features: --- kdewebdev/quanta/src/quanta.cpp #1.436:1.437 @@ -762,7 +762,17 @@ void QuantaApp::slotInsertTag(const KURL { QString width,height; - width.setNum( img.width () ); - height.setNum( img.height() ); - w->insertTag("<img src=\""+urlStr+"\" width=\""+width+"\" height=\""+height+"\" border=\"0\">"); + width.setNum(img.width()); + height.setNum(img.height()); + QString imgTag = QuantaCommon::tagCase("<img "); + imgTag += QuantaCommon::attrCase("src="); + imgTag += QuantaCommon::quoteAttributeValue(urlStr); + imgTag += QuantaCommon::attrCase(" width="); + imgTag += QuantaCommon::quoteAttributeValue(width); + imgTag += QuantaCommon::attrCase(" height="); + imgTag += QuantaCommon::quoteAttributeValue(height); + imgTag += QuantaCommon::attrCase(" border="); + imgTag += QuantaCommon::quoteAttributeValue(QString("%1").arg(0)); + imgTag += ">"; + w->insertTag(imgTag); isImage = true; } @@ -770,5 +780,9 @@ void QuantaApp::slotInsertTag(const KURL if (!isImage) { - w->insertTag( "<a href=\""+urlStr+"\">","</a>"); + QString tag = QuantaCommon::tagCase("<a "); + tag += QuantaCommon::attrCase("href="); + tag += QuantaCommon::quoteAttributeValue(urlStr); + tag += ">"; + w->insertTag(tag, QuantaCommon::tagCase("</a>")); } } --- kdewebdev/quanta/utility/quantacommon.cpp #1.79:1.80 @@ -101,4 +101,12 @@ QString QuantaCommon::attrCase( const QS } +/** returns the attribute value in quoted form, by taking care of the +quotation setting*/ +QString QuantaCommon::quoteAttributeValue(const QString& value) +{ + QString quote = qConfig.attrValueQuotation; + return quote + value + quote; +} + /** Set's up the url correctly from urlString. */ void QuantaCommon::setUrl(KURL &url, const QString& urlString) --- kdewebdev/quanta/utility/quantacommon.h #1.63:1.64 @@ -127,4 +127,7 @@ public: /** convert tag to upper or lower case */ static QString attrCase( const QString& attr); +/** returns the attribute value in quoted form, by taking care of the +quotation setting*/ + static QString quoteAttributeValue(const QString& value); /** Set's up the url correctly from urlString. */ static void setUrl(KURL &url, const QString& urlString); 5003 2004-03-03 18:28:18 +0000 2004-03-03 18:28:18 +0000 quote-tag-attribute.patch quote-tag-attribute.patch text/x-diff 1301 dennis SW5kZXg6IHNyYy9xdWFudGEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGV3 ZWJkZXYvcXVhbnRhL3NyYy9xdWFudGEuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQzNgpk aWZmIC11IC1yMS40MzYgcXVhbnRhLmNwcAotLS0gc3JjL3F1YW50YS5jcHAJMiBNYXIgMjAwNCAx MDo0ODoyMSAtMDAwMAkxLjQzNgorKysgc3JjL3F1YW50YS5jcHAJMyBNYXIgMjAwNCAxNzoxNjox NCAtMDAwMApAQCAtNzU1LDYgKzc1NSw3IEBACiAgICAgICB3LT5pbnNlcnRUYWcoZGlySW5mby5w cmVUZXh0K3VybFN0citkaXJJbmZvLnBvc3RUZXh0KTsKICAgICB9IGVsc2UKICAgICB7CisgICAg ICBRU3RyaW5nIGF0dHJpYnV0ZVF1b3RhdGlvbiA9IHFDb25maWcuYXR0clZhbHVlUXVvdGF0aW9u OyAgIAogICAgICAgaWYgKHVybC5pc0xvY2FsRmlsZSgpKQogICAgICAgewogICAgICAgICBRSW1h Z2UgaW1nKHVybC5wYXRoKCkpOwpAQCAtNzYzLDEzICs3NjQsMTMgQEAKICAgICAgICAgICBRU3Ry aW5nIHdpZHRoLGhlaWdodDsKICAgICAgICAgICB3aWR0aC5zZXROdW0oIGltZy53aWR0aCAoKSAp OwogICAgICAgICAgIGhlaWdodC5zZXROdW0oIGltZy5oZWlnaHQoKSApOwotICAgICAgICAgIHct Pmluc2VydFRhZygiPGltZyBzcmM9XCIiK3VybFN0cisiXCIgd2lkdGg9XCIiK3dpZHRoKyJcIiBo ZWlnaHQ9XCIiK2hlaWdodCsiXCIgYm9yZGVyPVwiMFwiPiIpOworICAgICAgICAgIHctPmluc2Vy dFRhZygiPGltZyBzcmM9IithdHRyaWJ1dGVRdW90YXRpb24rdXJsU3RyK2F0dHJpYnV0ZVF1b3Rh dGlvbisiIHdpZHRoPSIrYXR0cmlidXRlUXVvdGF0aW9uK3dpZHRoK2F0dHJpYnV0ZVF1b3RhdGlv bisgIiBoZWlnaHQ9IithdHRyaWJ1dGVRdW90YXRpb24raGVpZ2h0K2F0dHJpYnV0ZVF1b3RhdGlv bisiIGJvcmRlcj0iK2F0dHJpYnV0ZVF1b3RhdGlvbisiMCIrYXR0cmlidXRlUXVvdGF0aW9uKyI+ Iik7CiAgICAgICAgICAgaXNJbWFnZSA9IHRydWU7CiAgICAgICAgIH0KICAgICAgIH0KICAgICAg IGlmICghaXNJbWFnZSkKICAgICAgIHsKLSAgICAgICAgdy0+aW5zZXJ0VGFnKCAiPGEgaHJlZj1c IiIrdXJsU3RyKyJcIj4iLCI8L2E+Iik7CisgICAgICAgIHctPmluc2VydFRhZyggIjxhIGhyZWY9 IithdHRyaWJ1dGVRdW90YXRpb24rdXJsU3RyK2F0dHJpYnV0ZVF1b3RhdGlvbisiPiIsIjwvYT4i KTsKICAgICAgIH0KICAgICB9CiAgICAgdy0+dmlldygpLT5zZXRGb2N1cygpOwo=