summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2012-06-19 22:57:29 +0000
committerVincent Sanders <vince@netsurf-browser.org>2012-06-19 22:57:29 +0000
commit8611281b2efde71e17f20aedc9db22c1493788cc (patch)
tree13139feb9993a9babe2cb0638c31c5cd7d39c868 /content
parent08f18009c8d4e5b4bd16c364034e0490226c4181 (diff)
downloadnetsurf-8611281b2efde71e17f20aedc9db22c1493788cc.tar.gz
netsurf-8611281b2efde71e17f20aedc9db22c1493788cc.tar.bz2
add content handler for javascript
svn path=/trunk/netsurf/; revision=13971
Diffstat (limited to 'content')
-rw-r--r--content/content_type.h9
-rw-r--r--content/hlcache.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/content/content_type.h b/content/content_type.h
index 8e24e4e8e..c0b3a2b23 100644
--- a/content/content_type.h
+++ b/content/content_type.h
@@ -36,12 +36,21 @@ typedef enum {
CONTENT_TEXTPLAIN = 0x02,
CONTENT_CSS = 0x04,
+ /** All images */
CONTENT_IMAGE = 0x08,
+ /** Navigator API Plugins */
CONTENT_PLUGIN = 0x10,
+ /** Themes (only GTK) */
CONTENT_THEME = 0x20,
+ /** Javascript */
+ CONTENT_JS = 0x40,
+ /** All script types. */
+ CONTENT_SCRIPT = 0x40,
+
+ /** Any content matches */
CONTENT_ANY = 0x3f
} content_type;
diff --git a/content/hlcache.c b/content/hlcache.c
index a22162f50..e99f238ad 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -656,7 +656,7 @@ nserror hlcache_migrate_ctx(hlcache_retrieval_ctx *ctx,
hlcache_event hlevent;
hlevent.type = CONTENT_MSG_ERROR;
- hlevent.data.error = messages_get("BadType");
+ hlevent.data.error = messages_get("UnacceptableType");
ctx->handle->cb(ctx->handle, &hlevent,
ctx->handle->pw);