Merge pull request #875 from kossebau/customLogRenderer

Remove HTML rendering of logging out of normal BrowserRuntime

Author: Friedrich

webodf/CMakeLists.txt

@@ -13,7 +13,9 @@ include(${CMAKE_BINARY_DIR}/jsfileslist.txt)
 
 configure_file(webodfversion.js.in ${CMAKE_CURRENT_BINARY_DIR}/webodfversion.js)
 
-set(TESTJSFILES tests/core/ZipTests.js
+set(TESTJSFILES
+    tests/core/UnitTester.js
+    tests/core/ZipTests.js
     tests/core/Base64Tests.js
     tests/core/CursorTests.js
     tests/core/DomUtilsTests.js

webodf/lib/manifest.json

@@ -52,8 +52,6 @@
     "core.Task": [
         "core.ScheduledTask"
     ],
-    "core.UnitTester": [
-    ],
     "core.Utils": [
     ],
     "core.Zip": [

webodf/lib/runtime.js

@@ -340,9 +340,8 @@ Runtime.assert = function (condition, message) {
  * @constructor
  * @augments Runtime
  * @implements {Runtime}
- * @param {Element} logoutput
  */
-function BrowserRuntime(logoutput) {
+function BrowserRuntime() {
     "use strict";
     var self = this;
 
@@ -490,32 +489,13 @@ function BrowserRuntime(logoutput) {
      * @return {undefined}
      */
     function log(msgOrCategory, msg) {
-        var node, doc, category;
+        var category;
         if (msg !== undefined) {
             category = msgOrCategory;
         } else {
             msg = msgOrCategory;
         }
-        if (logoutput) {
-            doc = logoutput.ownerDocument;
-            if (category) {
-                node = doc.createElement("span");
-                node.className = category;
-                node.appendChild(doc.createTextNode(category));
-                logoutput.appendChild(node);
-                logoutput.appendChild(doc.createTextNode(" "));
-            }
-            node = doc.createElement("span");
-            if (msg.length > 0 && msg[0] === "<") {
-                node.innerHTML = msg;
-            } else {
-                node.appendChild(doc.createTextNode(msg));
-            }
-            logoutput.appendChild(node);
-            logoutput.appendChild(doc.createElement("br"));
-        } else if (console) {
-            console.log(msg);
-        }
+        console.log(msg);
         if (self.enableAlerts && category === "alert") {
             alert(msg);
         }
@@ -1492,7 +1472,7 @@ Runtime.create = function create() {
     var /**@type{!Runtime}*/
         result;
     if (String(typeof window) !== "undefined") {
-        result = new BrowserRuntime(window.document.getElementById("logoutput"));
+        result = new BrowserRuntime();
     } else if (String(typeof require) !== "undefined") {
         result = new NodeJSRuntime();
     } else {

webodf/lib/core/UnitTester.js webodf/tests/core/UnitTester.jswebodf/lib/core/UnitTester.js renamed to webodf/tests/core/UnitTester.js

@@ -31,6 +31,8 @@
         "core.StepIterator",
         "core.UnitTester"
     ],
+    "core.UnitTester": [
+    ],
     "core.ZipTests": [
         "core.UnitTester",
         "core.Zip"

webodf/tests/manifest.json

@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2012-2015 KO GmbH <copyright@kogmbh.com>
+ *
+ * @licstart
+ * This file is part of WebODF.
+ *
+ * WebODF is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License (GNU AGPL)
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * WebODF is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with WebODF.  If not, see <http://www.gnu.org/licenses/>.
+ * @licend
+ *
+ * @source: http://www.webodf.org/
+ * @source: https://github.com/kogmbh/WebODF/
+ */
+
+/*global window, runtime*/
+
+runtime.libraryPaths = (function () {
+    "use strict";
+
+    return function () {
+        return ["../lib", "."];
+    };
+}());
+
+runtime.log = (function () {
+    "use strict";
+
+    var normalLog = runtime.log,
+        logoutput = window.document.getElementById("logoutput");
+
+    return function (msgOrCategory, msg) {
+        var node, doc, category;
+
+        // do normal log first
+        normalLog(msgOrCategory, msg);
+
+        // now output also 
+        if (msg !== undefined) {
+            category = msgOrCategory;
+        } else {
+            msg = msgOrCategory;
+        }
+
+        doc = logoutput.ownerDocument;
+        if (category) {
+            node = doc.createElement("span");
+            node.className = category;
+            node.appendChild(doc.createTextNode(category));
+            logoutput.appendChild(node);
+            logoutput.appendChild(doc.createTextNode(" "));
+        }
+        node = doc.createElement("span");
+        if (msg.length > 0 && msg[0] === "<") {
+            node.innerHTML = msg;
+        } else {
+            node.appendChild(doc.createTextNode(msg));
+        }
+        logoutput.appendChild(node);
+        logoutput.appendChild(doc.createElement("br"));
+    };
+}());

webodf/tests/testruntimeadaption.js

@@ -10,13 +10,7 @@
     <div id="console"></div>
     <div id="logoutput"></div>
     <script src="../lib/runtime.js"></script>
-<script type="text/javascript">
-runtime.libraryPaths = (function () {
-    return function () {
-        return ["../lib", "."];
-    };
-}());
-</script>
+    <script src="testruntimeadaption.js"></script>
     <script src="tests.js"></script>
   </body>
 </html>

webodf/tests/tests.html

@@ -24,14 +24,14 @@
 
 /*global runtime, Runtime, core, gui, xmldom, RuntimeTests, odf, ops, webodf_css: true*/
 
+runtime.loadClass("core.UnitTester");
 runtime.loadClass("core.Base64Tests");
 runtime.loadClass("core.CursorTests");
 runtime.loadClass("core.DomUtilsTests");
 runtime.loadClass("core.EventSubscriptionsTests");
 runtime.loadClass("core.PositionIteratorTests");
 runtime.loadClass("core.RuntimeTests");
 runtime.loadClass("core.StepIteratorTests");
-runtime.loadClass("core.UnitTester");
 runtime.loadClass("core.ZipTests");
 runtime.loadClass("gui.DirectFormattingControllerTests");
 runtime.loadClass("gui.GuiStepUtilsTests");

webodf/tests/tests.js

@@ -42,7 +42,6 @@ module.exports = function (config) {
             'lib/core/RawInflate.js',
             'lib/core/enums.js',
             'lib/core/StepIterator.js',
-            'lib/core/UnitTester.js',
             'lib/core/Utils.js',
             'lib/core/Zip.js',
             'lib/core/typedefs.js',

webodf/tools/karma.conf.js

@@ -650,6 +650,7 @@ function main(f) {
         delete contents[pathModule.normalize("lib/runtime.js")];
         delete contents[pathModule.normalize("lib/core/JSLint.js")];
         delete contents[pathModule.normalize("tests/tests.js")];
+        delete contents[pathModule.normalize("tests/testruntimeadaption.js")];
         Object.keys(contents).forEach(function (name) {
             if (typeof contents[name] === "string") {
                 files[name] = contents[name];