summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2012-10-02 13:33:08 +0100
committerVincent Sanders <vince@netsurf-browser.org>2012-10-02 13:34:03 +0100
commit2f1ca751d66cbb2f027e9acdf24725efacd8023a (patch)
tree20d12ff7b1ee10c62f38b020c01eb39890c78ea8
parentc2eff23c0d5d1232a3d4da59e3abf261223f7fed (diff)
downloadnetsurf-2f1ca751d66cbb2f027e9acdf24725efacd8023a.tar.gz
netsurf-2f1ca751d66cbb2f027e9acdf24725efacd8023a.tar.bz2
make the "none" javascript implmentation specifically disable the scripting option
-rw-r--r--javascript/none.c2
-rw-r--r--test/js/index.html1
-rw-r--r--test/js/noscript-inline-doc-write.html14
3 files changed, 17 insertions, 0 deletions
diff --git a/javascript/none.c b/javascript/none.c
index e5cfb0d33..b5cfc7875 100644
--- a/javascript/none.c
+++ b/javascript/none.c
@@ -21,12 +21,14 @@
*/
#include "content/content.h"
+#include "desktop/options.h"
#include "javascript/js.h"
#include "utils/log.h"
void js_initialise(void)
{
+ nsoption_set_bool(enable_javascript, false);
}
void js_finalise(void)
diff --git a/test/js/index.html b/test/js/index.html
index 276854712..a7d34f5a1 100644
--- a/test/js/index.html
+++ b/test/js/index.html
@@ -11,6 +11,7 @@
<h2>Document write tests</h2>
<ul>
<li><a href="inline-doc-write-simple.html">Simple docuemnt write</a></li>
+<li><a href="noscript-inline-doc-write.html">Script within inline script document write with noscript alternative</a></li>
<li><a href="inline-doc-write.html">Script within inline script</a></li>
<li><a href="sync-script.html">External syncronous script</a></li>
<li><a href="sync-script-err.html">External syncronous script with missing js file</a></li>
diff --git a/test/js/noscript-inline-doc-write.html b/test/js/noscript-inline-doc-write.html
new file mode 100644
index 000000000..f310518ff
--- /dev/null
+++ b/test/js/noscript-inline-doc-write.html
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>Inline Docuemnt Write Test</title>
+<link rel="stylesheet" type="text/css" href="tst.css">
+</head>
+<body>
+<h1>Inline Document Write Test</h1>
+<p>Before</p>
+<script>document.write("<scr" +"ipt>document.write(\"Goodbye Cruel World\");</scri" + "pt>");</script>
+</script>
+<noscript>Browser has scripting disabled</noscript>
+<p>Afterwards</p>
+</body>
+</html>