Archives/gnosygnu_xowa
1
0
Fork 0
mirror of https://github.com/gnosygnu/xowa.git synced 2024-10-27 20:34:16 +00:00
Code Issues Projects Releases Wiki Activity

Xtn.Popups: Update page title on Scrib_core when generating popup [#338]

Browse Source
This commit is contained in:
gnosygnu 2019-02-01 22:05:42 -05:00
parent 8b13930d30
commit c32a4ae253
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_parser.java
View File

@ -80,6 +80,9 @@ public class Xow_popup_parser {
wrdx_mkr.Init();
data.Init(cfg, popup_itm, tmpl_len);
Init_ctxs(tmpl_src, page.Ttl());
// update Scrib_core with popup_title; EX:en.d:dada and hover over Category:Mauritian_Creole_nouns; ISSUE#:338; DATE:2019-02-01
// NOTE: must occur after Init_ctxs, b/c ctx.Clear() will eventually call Scrib_lib_title.When_page_changed()
wiki.Parser_mgr().Scrib().When_page_changed(Xoae_page.New(wiki, popup_itm.Page_ttl()));
while (data.Words_needed_chk()) {
if (Canceled(popup_itm, cur_tab)) return null;
tmpl_root.Clear();
@ -207,7 +210,7 @@ public class Xow_popup_parser {
}
}
private void Wtxt_ctx_init(boolean incremental, byte[] bry) {
wtxt_ctx.Clear_all();
wtxt_ctx.Clear(incremental); // NOTE: clear_scrib if full; do not clear if incremental, else When_page_changed event fires; DATE:2019-02-01
wtxt_ctx.Page().Html_data().Html_restricted_(data.Html_restricted());
wtxt_ctx.Para().Enabled_(!incremental); // NOTE: if incremental, disable para; easier to work with \n rather than <p>; also, must be enabled before Page_bgn; DATE:2014-06-18DATE:2014-06-18
wtxt_ctx.Lnke().Dangling_goes_on_stack_(incremental);

15
400_xowa/src/gplx/xowa/htmls/modules/popups/Xow_popup_parser_tst.java
View File

@ -14,7 +14,7 @@ GPLv3 License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-GPLv3.txt
Apache License: https://github.com/gnosygnu/xowa/blob/master/LICENSE-APACHE2.txt
*/
package gplx.xowa.htmls.modules.popups; import gplx.*; import gplx.xowa.*; import gplx.xowa.htmls.*; import gplx.xowa.htmls.modules.*;
import org.junit.*; import gplx.core.primitives.*;
import org.junit.*; import gplx.core.tests.*; import gplx.core.primitives.*;
import gplx.xowa.apps.apis.xowa.html.modules.*;
import gplx.xowa.wikis.nss.*;
import gplx.xowa.guis.views.*;
@ -453,6 +453,10 @@ public class Xow_popup_parser_tst {
));
fxt.Expd_tmpl_loop_count(2);
}
@Test public void Scrib_core_ttl() {
fxt.Test_parse("abc", "Page1", "PopupPage1", "<p>abc\n</p>");
fxt.Test_scrib_core_ttl("PopupPage1");
}
}
class Xop_popup_parser_fxt {
private Xow_popup_parser parser; private Xowe_wiki wiki;
@ -475,6 +479,7 @@ class Xop_popup_parser_fxt {
parser.Html_mkr().Output_tidy_(false);
parser.Html_mkr().Fmtr_next_sect().Fmt_(" (~{next_sect_val})");
parser.Wrdx_mkr().Xnde_ignore_ids_(Bry_.new_a7("coordinates"));
wiki.Parser_mgr().Scrib().Core_init(parser.Wtxt_ctx());
word_min = 2;
}
public Xop_popup_parser_fxt Init_notoc_(String v) {parser.Cfg().Notoc_(Bry_.new_u8(v)); return this;}
@ -495,6 +500,9 @@ class Xop_popup_parser_fxt {
Tfds.Eq_ary(expd, To_int_ary(ids));
return this;
}
public void Test_scrib_core_ttl(String expd) {
Gftest.Eq__str(expd, String_.new_u8(wiki.Parser_mgr().Scrib().Core().Page().Ttl().Full_db()));
}
private static int[] To_int_ary(Int_obj_ref[] ary) {
int len = ary.length;
int[] rv = new int[len];
@ -503,11 +511,12 @@ class Xop_popup_parser_fxt {
return rv;
}
public void Test_parse(String raw, String expd) {Test_parse(raw, "Test_1", expd);}
public void Test_parse(String raw, String ttl, String expd) {
public void Test_parse(String raw, String ttl, String expd) {Test_parse(raw, ttl, ttl, expd);}
public void Test_parse(String raw, String ttl, String popup_ttl, String expd) {
Xoae_page page = Xoae_page.New_edit(wiki, Xoa_ttl.Parse(wiki, Bry_.new_a7(ttl)));
page.Db().Text().Text_bry_(Bry_.new_u8(raw));
Xow_popup_itm itm = new Xow_popup_itm("popup_1", Bry_.new_u8(raw), Bry_.Empty, word_min);
itm.Init(wiki.Domain_bry(), page.Ttl());
itm.Init(wiki.Domain_bry(), wiki.Ttl_parse(Bry_.new_u8(popup_ttl)));
byte[] actl = parser.Parse(wiki, page, null, itm);
Tfds.Eq_str_lines(expd, String_.new_u8(actl));
}