Merge branch 'master' into vector-api

2013-11-28 21:00:18 +01:00
parent a06ba8d4aa 1ac93d09c9
commit d2fd695635
17 changed files with 280 additions and 1117 deletions
--- a/old/src/ol/parser/kmlparser.js
+++ b/old/src/ol/parser/kmlparser.js
@@ -75,7 +75,7 @@ ol.parser.KML = function(opt_options) {
      '*': function(node, obj) {
        if (this.extractAttributes === true) {
          var len = node.childNodes.length;
-          if ((len === 1 || len === 2) && (node.firstChild.nodeType === 3 ||
+          if (len > 0 && (node.firstChild.nodeType === 3 ||
              node.firstChild.nodeType === 4)) {
            var readers = this.readers[this.defaultNamespaceURI];
            readers['_attribute'].apply(this, arguments);