summaryrefslogtreecommitdiff
path: root/amiga/menu.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-08-09 14:22:29 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-08-09 14:22:29 +0100
commit3b9a91312584dcf223c9d1f6314bc5b2bde868a1 (patch)
tree4710a60c1d8f2619b5021aee5822d55b10bc1f29 /amiga/menu.c
parent8d4c4b91795a1788ddb8dea1e21bdbd2ada4e588 (diff)
downloadnetsurf-3b9a91312584dcf223c9d1f6314bc5b2bde868a1.tar.gz
netsurf-3b9a91312584dcf223c9d1f6314bc5b2bde868a1.tar.bz2
Permanently enable display of the "enable javascript" UI options
Diffstat (limited to 'amiga/menu.c')
-rw-r--r--amiga/menu.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/amiga/menu.c b/amiga/menu.c
index f4b35f0a4..556b01496 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -671,10 +671,8 @@ static void ami_init_menulabs(struct gui_window_2 *gwin)
ami_menu_item_browser_foreimg, NULL);
ami_menu_alloc_item(gwin, M_IMGBACK, NM_SUB, "BackImg", 0, NULL,
ami_menu_item_browser_backimg, NULL);
-#if defined(WITH_JS) || defined(WITH_MOZJS)
ami_menu_alloc_item(gwin, M_JS, NM_ITEM, "EnableJS", 0, NULL,
ami_menu_item_browser_enablejs, NULL);
-#endif
ami_menu_alloc_item(gwin, M_BAR_B4, NM_ITEM, NM_BARLABEL, 0, NULL, NULL, NULL);
ami_menu_alloc_item(gwin, M_REDRAW, NM_ITEM, "Redraw", 0, "TBImages:list_wand",
ami_menu_item_browser_redraw, NULL);
@@ -928,11 +926,9 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin)
ami_menu_arexx_scan(gwin);
gwin = ami_menu_layout(gwin);
-#if defined(WITH_JS) || defined(WITH_MOZJS)
gwin->menu[M_JS].nm_Flags = CHECKIT | MENUTOGGLE;
if(nsoption_bool(enable_javascript) == true)
gwin->menu[M_JS].nm_Flags |= CHECKED;
-#endif
gwin->menu[M_PRINT].nm_Flags = NM_ITEMDISABLED;
@@ -1048,7 +1044,6 @@ void ami_menu_update_checked(struct gui_window_2 *gwin)
GetAttr(WINDOW_MenuStrip, gwin->objects[OID_MAIN], (ULONG *)&menustrip);
if(!menustrip) return;
-#if defined(WITH_JS) || defined(WITH_MOZJS)
if(nsoption_bool(enable_javascript) == true) {
if((ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED) == 0)
ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED;
@@ -1056,7 +1051,6 @@ void ami_menu_update_checked(struct gui_window_2 *gwin)
if(ItemAddress(menustrip, AMI_MENU_JS)->Flags & CHECKED)
ItemAddress(menustrip, AMI_MENU_JS)->Flags ^= CHECKED;
}
-#endif
if(nsoption_bool(foreground_images) == true) {
if((ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags & CHECKED) == 0)
ItemAddress(menustrip, AMI_MENU_FOREIMG)->Flags ^= CHECKED;