zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/iframe into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Chris Hillery (ceejatec)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/iframe/+merge/91202

don't output empty iframe elements for html serialization
-- 
https://code.launchpad.net/~zorba-coders/zorba/iframe/+merge/91202
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-01 16:36:44 +0000
+++ ChangeLog	2012-02-02 05:56:19 +0000
@@ -34,6 +34,7 @@
   * Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
   * Fixed bug #918157 (Add XQFTTS to validation queue)
   * Fixed bug with unversioned modules with C++ external functions
+  * Don't output empty iframe elements when serializing as html
 
 version 2.1
 

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2012-01-11 17:30:25 +0000
+++ src/api/serialization/serializer.cpp	2012-02-02 05:56:19 +0000
@@ -984,12 +984,10 @@
   zstring nodename;
   utf8::to_lower(item->getNodeName()->getStringValue(), &nodename);
 
-  if (ztd::equals(nodename, "script", 6) ||
+  return (ztd::equals(nodename, "script", 6) ||
       ztd::equals(nodename, "textarea", 8) ||
-      ztd::equals(nodename, "div", 3))
-    return true;
-  else
-    return false;
+      ztd::equals(nodename, "iframe", 6) ||
+      ztd::equals(nodename, "div", 3));
 }