1
0
mirror of https://github.com/gnosygnu/xowa.git synced 2026-03-02 03:49:30 +00:00

'v3.3.4.1'

This commit is contained in:
gnosygnu
2016-03-27 23:44:59 -04:00
parent de67253a9c
commit baaef32df2
903 changed files with 13339 additions and 8695 deletions

View File

@@ -43,7 +43,7 @@ public class Xow_popup_html_mkr {
, hdom_bry
, wiki.Lang().Dir_ltr_bry()
, page_url
, String_.new_u8(page.Ttl().Full_txt())
, String_.new_u8(page.Ttl().Full_txt_w_ttl_case())
, popup_itm.Popup_id()
, Xow_popup_html_bldr_.Bld_fmtr_wiki(fmtr_wiki, wrdx_bfr, cur_wiki.Domain_bry(), page.Wiki().Domain_bry()) // NOTE: use cur_wiki, not page_wiki; DATE:2014-06-28
, gplx.core.ios.Io_size_.To_str(page.Data_raw().length)
@@ -62,7 +62,7 @@ class Xow_popup_html_bldr_ {
}
public static byte[] Bld_fmtr_viewed(Bry_fmtr fmtr, Xoae_app app, Xowe_wiki wiki, Bry_bfr wrdx_bfr, Xoa_ttl ttl) {
byte[] view_time_item = Bry_.Empty;
gplx.xowa.users.history.Xou_history_itm history_itm = app.Usere().History_mgr().Get_or_null(wiki.Domain_bry(), ttl.Full_txt());
gplx.xowa.users.history.Xou_history_itm history_itm = app.Usere().History_mgr().Get_or_null(wiki.Domain_bry(), ttl.Full_txt_w_ttl_case());
if (history_itm != null)
view_time_item = fmtr.Bld_bry_many(wrdx_bfr, history_itm.View_end().XtoStr_fmt_yyyy_MM_dd_HH_mm_ss());
return view_time_item;

View File

@@ -25,7 +25,6 @@ public class Xow_popup_itm implements Cancelable {
}
public boolean Canceled() {return canceled;} private boolean canceled = false;
public void Cancel() {canceled = true;}
public void Cancel_reset() {canceled = false;}
public byte Mode() {return mode;} private byte mode = Mode_tid_init;
public Xow_popup_itm Mode_more_(int more_words) {
mode = Mode_tid_more;

View File

@@ -21,7 +21,7 @@ import gplx.core.js.*;
import gplx.xowa.wikis.nss.*;
import gplx.xowa.guis.views.*;
import gplx.xowa.htmls.hrefs.*;
import gplx.xowa.specials.*; import gplx.xowa.specials.search.*;
import gplx.xowa.specials.*;
import gplx.xowa.apps.apis.xowa.html.modules.*;
public class Xow_popup_mgr implements GfoInvkAble, GfoEvObj {
private Xoae_app app; private Xowe_wiki wiki; private Js_wtr js_wtr = new Js_wtr();

View File

@@ -460,8 +460,8 @@ class Xop_popup_parser_fxt {
private Xow_popup_parser parser; private Xowe_wiki wiki;
private int word_min = 2;
public void Clear() {
Xoae_app app = Xoa_app_fxt.app_();
this.wiki = Xoa_app_fxt.wiki_(app, "en.wiki");
Xoae_app app = Xoa_app_fxt.Make__app__edit();
this.wiki = Xoa_app_fxt.Make__wiki__edit(app, "en.wiki");
parser = wiki.Html_mgr().Head_mgr().Popup_mgr().Parser();
parser.Init_by_wiki(wiki);
parser.Cfg().Tmpl_read_len_(4);

View File

@@ -53,20 +53,20 @@ public class Xow_popup_wrdx_mkr {
case Xop_tkn_itm_.Tid_xnde:
xnde = (Xop_xnde_tkn)tkn;
switch (xnde.Tag().Id()) {
case Xop_xnde_tag_.Tid_div:
case Xop_xnde_tag_.Tid_table: case Xop_xnde_tag_.Tid_tr: case Xop_xnde_tag_.Tid_td: case Xop_xnde_tag_.Tid_th:
case Xop_xnde_tag_.Tid_caption: case Xop_xnde_tag_.Tid_thead: case Xop_xnde_tag_.Tid_tfoot: case Xop_xnde_tag_.Tid_tbody:
case Xop_xnde_tag_.Tid_ref: case Xop_xnde_tag_.Tid_gallery: case Xop_xnde_tag_.Tid_imageMap: case Xop_xnde_tag_.Tid_timeline:
case Xop_xnde_tag_.Tid_xowa_html: // needed for Help:Options, else \n at top of doc; DATE:2014-06-22
case Xop_xnde_tag_.Tid__div:
case Xop_xnde_tag_.Tid__table: case Xop_xnde_tag_.Tid__tr: case Xop_xnde_tag_.Tid__td: case Xop_xnde_tag_.Tid__th:
case Xop_xnde_tag_.Tid__caption: case Xop_xnde_tag_.Tid__thead: case Xop_xnde_tag_.Tid__tfoot: case Xop_xnde_tag_.Tid__tbody:
case Xop_xnde_tag_.Tid__ref: case Xop_xnde_tag_.Tid__gallery: case Xop_xnde_tag_.Tid__imageMap: case Xop_xnde_tag_.Tid__timeline:
case Xop_xnde_tag_.Tid__xowa_html: // needed for Help:Options, else \n at top of doc; DATE:2014-06-22
add_tkn = add_subs = false; // skip tblxs
xnde = null;
break;
case Xop_xnde_tag_.Tid_math: // add <math> as one unit; PAGE:en.w:System_of_polynomial_equations DATE:2014-07-01
case Xop_xnde_tag_.Tid__math: // add <math> as one unit; PAGE:en.w:System_of_polynomial_equations DATE:2014-07-01
add_subs = false; // never recur
xnde = null;
data.Words_found_add(tkn); // treat it as one word
break;
case Xop_xnde_tag_.Tid_br:
case Xop_xnde_tag_.Tid__br:
add_tkn = false; // never add_tkn Src_bgn / Src_end; note add_subs should still be true; PAGE:en.q:Earth; DATE:2014-06-30
if (wrdx_bfr.Len_eq_0()) // don't add <br/> to start of document; needed for Help:Options, but good to have everywhere; DATE:2014-06-22
add_subs = false;

View File

@@ -41,8 +41,8 @@ class Xop_keeplist_wiki_fxt {
public void Clear() {
}
public Xop_keeplist_wiki keeplist_wiki_(String raw) {
Xoae_app app = Xoa_app_fxt.app_();
Xowe_wiki wiki = Xoa_app_fxt.wiki_(app, "enwiki");
Xoae_app app = Xoa_app_fxt.Make__app__edit();
Xowe_wiki wiki = Xoa_app_fxt.Make__wiki__edit(app, "enwiki");
Xow_popup_mgr popup_mgr = wiki.Html_mgr().Head_mgr().Popup_mgr();
popup_mgr.Init_by_wiki(wiki);
popup_mgr.Parser().Tmpl_keeplist_init_(Bry_.new_u8(raw));