diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-08-09 14:22:29 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-08-09 14:22:29 +0100 |
| commit | 3b9a91312584dcf223c9d1f6314bc5b2bde868a1 (patch) | |
| tree | 4710a60c1d8f2619b5021aee5822d55b10bc1f29 /amiga | |
| parent | 8d4c4b91795a1788ddb8dea1e21bdbd2ada4e588 (diff) | |
| download | netsurf-3b9a91312584dcf223c9d1f6314bc5b2bde868a1.tar.gz netsurf-3b9a91312584dcf223c9d1f6314bc5b2bde868a1.tar.bz2 | |
Permanently enable display of the "enable javascript" UI options
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/gui_options.c | 4 | ||||
| -rw-r--r-- | amiga/menu.c | 6 | ||||
| -rwxr-xr-x | amiga/menu.h | 2 |
3 files changed, 0 insertions, 12 deletions
diff --git a/amiga/gui_options.c b/amiga/gui_options.c index a95e74a3d..d42aa1601 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -644,7 +644,6 @@ void ami_gui_opts_open(void) LABEL_Text, gadlab[GID_OPTS_HISTORY], LabelEnd, LayoutEnd, // history -#if defined(WITH_JS) || defined(WITH_MOZJS) LAYOUT_AddChild, LayoutVObj, LAYOUT_SpaceOuter, TRUE, LAYOUT_BevelStyle, BVS_GROUP, @@ -656,7 +655,6 @@ void ami_gui_opts_open(void) GA_Selected, nsoption_bool(enable_javascript), CheckBoxEnd, LayoutEnd, // scripting -#endif LayoutEnd, CHILD_WeightedHeight, 0, LAYOUT_AddChild, LayoutVObj, @@ -1573,14 +1571,12 @@ static void ami_gui_opts_use(bool save) nsoption_set_bool(send_referer, false); } -#if defined(WITH_JS) || defined(WITH_MOZJS) GetAttr(GA_Selected,gow->objects[GID_OPTS_JAVASCRIPT],(ULONG *)&data); if (data) { nsoption_set_bool(enable_javascript, true); } else { nsoption_set_bool(enable_javascript, false); } -#endif GetAttr(GA_Selected,gow->objects[GID_OPTS_DONOTTRACK],(ULONG *)&data); if (data) { 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; diff --git a/amiga/menu.h b/amiga/menu.h index a2b79abf3..516aedf43 100755 --- a/amiga/menu.h +++ b/amiga/menu.h @@ -81,9 +81,7 @@ enum { M_IMAGES, M_IMGFORE, M_IMGBACK, -#if defined(WITH_JS) || defined(WITH_MOZJS) M_JS, -#endif M_BAR_B4, M_REDRAW, /* Hotlist menu */ |