OSDN Git Service

ActiveXに関する例外処理の修正
authordhrname <sie-developers@lists.sourceforge.jp>
Sat, 9 Aug 2014 14:34:28 +0000 (23:34 +0900)
committerdhrname <sie-developers@lists.sourceforge.jp>
Sat, 9 Aug 2014 14:34:28 +0000 (23:34 +0900)
org/w3c/dom/svg.js

index 56dd52a..5328934 100644 (file)
@@ -1082,19 +1082,21 @@ function SVGURIReference() {
                      *それら以外は、_instanceプロパティにDOMツリーを格納しておく\r
                      */\r
                     if (tar.localName !== "script" && tar.localName !== "style") {\r
-                      doc = new ActiveXObject("MSXML2.DomDocument");\r
-                      str = xmlhttp.responseText.replace(/!DOCTYPE/,"!--").replace(/(dtd">|\]>)/,"-->");\r
-                      ndoc = NAIBU.doc;\r
-                      ndoc.async = ndoc.validateOnParse = ndoc.resolveExternals = ndoc.preserveWhiteSpace = false;\r
-                      doc.loadXML(str);\r
-                      ele = doc.documentElement;\r
-                      Sfunc = SVGURIReference;\r
-                      SVGURIReference = function(){};\r
-                      tar._instance = tar.ownerDocument.importNode(ele, true);\r
-                      SVGURIReference = Sfunc;\r
-                      if (id) {\r
-                        tar._instance = tar._instance.ownerDocument.getElementById(id);\r
-                      }\r
+                      try {\r
+                        doc = new ActiveXObject("MSXML2.DomDocument");\r
+                        str = xmlhttp.responseText.replace(/!DOCTYPE/,"!--").replace(/(dtd">|\]>)/,"-->");\r
+                        ndoc = NAIBU.doc;\r
+                        ndoc.async = ndoc.validateOnParse = ndoc.resolveExternals = ndoc.preserveWhiteSpace = false;\r
+                        doc.loadXML(str);\r
+                        ele = doc.documentElement;\r
+                        Sfunc = SVGURIReference;\r
+                        SVGURIReference = function(){};\r
+                        tar._instance = tar.ownerDocument.importNode(ele, true);\r
+                        SVGURIReference = Sfunc;\r
+                        if (id) {\r
+                          tar._instance = tar._instance.ownerDocument.getElementById(id);\r
+                        }\r
+                      } catch (e) {}\r
                     } else {\r
                       tar._text = xmlhttp.responseText;\r
                     }\r
@@ -5153,7 +5155,9 @@ function SVGAElement(_doc) {
             }\r
             ob = NAIBU._search([sd.lastChild]);\r
           }\r
-          NAIBU.doc = new ActiveXObject("MSXML2.DomDocument");\r
+          try{\r
+            NAIBU.doc = new ActiveXObject("MSXML2.DomDocument");\r
+          } catch (e) {}\r
           evt.preventDefault();\r
           ob._next = {\r
             _init: (function (ob) {\r