From e0f17a8d350c41f5dd304b7968a60bfec84c5b06 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 3 Nov 2012 16:27:31 +0000 Subject: fix cocoa Message generation --- cocoa/Makefile.target | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 82900b6b0..fa1f7a095 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -146,7 +146,7 @@ R_RESOURCES := default.css adblock.css internal.css quirks.css NetSurf.icns Home R_RESOURCES := $(addprefix cocoa/res/,$(R_RESOURCES)) LANGUAGES := de en fr it nl -LOCALIZED_RESOURCES := Messages Localizable.strings +LOCALIZED_RESOURCES := Localizable.strings TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \ AquaTabClose_Front_Rollover.png \ @@ -163,12 +163,16 @@ TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \ R_RESOURCES += $(addprefix cocoa/PSMTabBarControl/Images/,$(TABBAR_RESOURCES)) +#languiage project macro +# $1 is language name +# $2 is list of resources per language define make_lproj R_RESOURCES += $$(OBJROOT)/$(1).lproj $$(OBJROOT)/$(1).lproj: $(2) $(VQ)echo Bundling language $(1) $(Q)mkdir -p $$@ $(Q)cp -pLR $(2) $$@ + $(Q)$(PERL) utils/split-messages.pl $(1) cocoa < resources/FatMessages > $$@/Messages endef # compile_xib (xib) (lang) -- cgit v1.2.3 From 85c973f98648465ab065317f8e7db6153d093984 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 3 Nov 2012 17:37:59 +0000 Subject: add jsstring to jsval conversion macro that copes with null jsstrings --- javascript/jsapi.h | 4 ++++ test/js/dom-location.html | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 test/js/dom-location.html diff --git a/javascript/jsapi.h b/javascript/jsapi.h index e7c10c139..61baa5ce1 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -94,6 +94,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, outchar = JS_GetStringBytes(injsstring); \ outlen = strlen(outchar) +/* string type cast */ +#define JSAPI_STRING_TO_JSVAL(str) ((str == NULL)?JSVAL_NULL:STRING_TO_JSVAL(str)) #else /* #if JS_VERSION <= 180 */ @@ -152,6 +154,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, JS_EncodeStringToBuffer(injsstring, outchar, outlen); \ outchar[outlen] = '\0' +/* string type cast */ +#define JSAPI_STRING_TO_JSVAL(str) ((str == NULL)?JSVAL_NULL:STRING_TO_JSVAL(str)) #endif diff --git a/test/js/dom-location.html b/test/js/dom-location.html new file mode 100644 index 000000000..bbd78d80b --- /dev/null +++ b/test/js/dom-location.html @@ -0,0 +1,13 @@ + + +Assign window.lately + + + +

Assign window.lately

location: +

location.protocol: +

equivalence +

assignement + + -- cgit v1.2.3