mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.netsurf-browser.org/netsurf

This commit is contained in:
Daniel Silverstone 2012-11-03 18:28:48 +00:00
parent e7431898ab 85c973f986
commit 6648ba39ad
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocoa/Makefile.target
View File

@ -146,7 +146,7 @@ R_RESOURCES := default.css adblock.css internal.css quirks.css NetSurf.icns Home
R_RESOURCES := $(addprefix cocoa/res/,$(R_RESOURCES)) R_RESOURCES := $(addprefix cocoa/res/,$(R_RESOURCES))
LANGUAGES := de en fr it nl LANGUAGES := de en fr it nl
LOCALIZED_RESOURCES := Messages Localizable.strings LOCALIZED_RESOURCES := Localizable.strings
TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \ TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \
AquaTabClose_Front_Rollover.png \ AquaTabClose_Front_Rollover.png \
@ -163,12 +163,16 @@ TABBAR_RESOURCES := AquaTabClose_Front_Pressed.png \
R_RESOURCES += $(addprefix cocoa/PSMTabBarControl/Images/,$(TABBAR_RESOURCES)) 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 define make_lproj
R_RESOURCES += $$(OBJROOT)/$(1).lproj R_RESOURCES += $$(OBJROOT)/$(1).lproj
$$(OBJROOT)/$(1).lproj: $(2) $$(OBJROOT)/$(1).lproj: $(2)
$(VQ)echo Bundling language $(1) $(VQ)echo Bundling language $(1)
$(Q)mkdir -p $$@ $(Q)mkdir -p $$@
$(Q)cp -pLR $(2) $$@ $(Q)cp -pLR $(2) $$@
$(Q)$(PERL) utils/split-messages.pl $(1) cocoa < resources/FatMessages > $$@/Messages
endef endef
# compile_xib (xib) (lang) # compile_xib (xib) (lang)

4
javascript/jsapi.h
View File

@ -94,6 +94,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
outchar = JS_GetStringBytes(injsstring); \ outchar = JS_GetStringBytes(injsstring); \
outlen = strlen(outchar) 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 */ #else /* #if JS_VERSION <= 180 */
@ -152,6 +154,8 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
JS_EncodeStringToBuffer(injsstring, outchar, outlen); \ JS_EncodeStringToBuffer(injsstring, outchar, outlen); \
outchar[outlen] = '\0' outchar[outlen] = '\0'
/* string type cast */
#define JSAPI_STRING_TO_JSVAL(str) ((str == NULL)?JSVAL_NULL:STRING_TO_JSVAL(str))
#endif #endif

13
test/js/dom-location.html Normal file
View File

@ -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>