Merge branch 'master' of git://git.netsurf-browser.org/netsurf
This commit is contained in:
commit
6648ba39ad
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -0,0 +1,13 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>Assign window.lately</title>
|
||||
<link rel="stylesheet" type="text/css" href="tst.css">
|
||||
</head>
|
||||
<body>
|
||||
<h1>Assign window.lately</h1>
|
||||
<p>location: <script>document.write(location);</script>
|
||||
<p>location.protocol: <script>document.write(location.protocol);</script>
|
||||
<p>equivalence <script>document.write(location.protocol === 'http:');</script>
|
||||
<p>assignement<script>window.lately = (location.protocol === 'http:');</script>
|
||||
</body>
|
||||
</html>
|
Loading…
Reference in New Issue