瀏覽代碼

修改阅读器输入参数 para->par

visuddhinanda 4 年之前
父節點
當前提交
1e9827d5ac

+ 1 - 1
app/palicanon/palicanon.js

@@ -191,7 +191,7 @@ function render_chapter_head(chapter_info, parent) {
 		parent +
 		"')\">back</span></div>";
 	html += "</div>";
-	let link = "../reader/?view=chapter&book=" + chapter_info.book + "&para=" + chapter_info.paragraph;
+	let link = "../reader/?view=chapter&book=" + chapter_info.book + "&par=" + chapter_info.paragraph;
 	html += "<div class='title'>";
 	if (typeof chapter_info.trans_title == "undefined") {
 		html += "	<div class='title_1'><a href='" + link + "' target='_blank'>" + chapter_info.text + "</a></div>";

+ 8 - 0
app/reader/index.php

@@ -32,6 +32,10 @@ require_once "../pcdl/html_head.php";
 	if(isset($_GET["para"])){
 		echo "_reader_para='".$_GET["para"]."';";
 	}
+	if(isset($_GET["par"])){
+		#为了避免 &para被urlencode替换问题
+		echo "_reader_para='".$_GET["par"]."';";
+	}
 	if(isset($_GET["begin"])){
 		echo "_reader_begin='".$_GET["begin"]."';";
 	}
@@ -42,6 +46,10 @@ require_once "../pcdl/html_head.php";
 	if(isset($_GET["channal"])){
 		echo "_channal='".$_GET["channal"]."';";
 	}
+	if(isset($_GET["channel"])){
+		#纠正拼写错误
+		echo "_channal='".$_GET["channel"]."';";
+	}
 	if(isset($_GET["lang"])){
 		echo "_lang='".$_GET["lang"]."';";
 	}

+ 5 - 5
app/reader/reader.js

@@ -89,7 +89,7 @@ function reader_load() {
 					tocNextMenu +=
 						"<a href='../reader/?view=chapter&book=" +
 						_reader_book +
-						"&para=" +
+						"&par=" +
 						element.paragraph +
 						"'>" +
 						element.toc +
@@ -118,7 +118,7 @@ function reader_load() {
 							(element.level - firstLevel) +
 							"'><a href='../reader/?view=chapter&book=" +
 							_reader_book +
-							"&para=" +
+							"&par=" +
 							element.paragraph +
 							"&display=" +
 							_display +
@@ -172,7 +172,7 @@ function reader_draw_para_menu() {
 }
 
 function junp_to_para(book, para) {
-	let url = "../reader/?view=para&book=" + book + "&para=" + para + "&display=sent";
+	let url = "../reader/?view=para&book=" + book + "&par=" + para + "&display=sent";
 	location.assign(url);
 }
 
@@ -252,7 +252,7 @@ function set_channal(channalid) {
 		url += "&book=" + _reader_book;
 	}
 	if (_reader_para != -1) {
-		url += "&para=" + _reader_para;
+		url += "&par=" + _reader_para;
 	}
 	if (_reader_begin != -1) {
 		url += "&begin=" + _reader_begin;
@@ -289,7 +289,7 @@ function setMode(mode = "read") {
 		url += "&book=" + _reader_book;
 	}
 	if (_reader_para != -1) {
-		url += "&para=" + _reader_para;
+		url += "&par=" + _reader_para;
 	}
 	if (_reader_begin != -1) {
 		url += "&begin=" + _reader_begin;

+ 1 - 1
app/search/paliword.js

@@ -83,7 +83,7 @@ function render_word_result(worddata) {
 	html +=
 		"<a href='../reader/?view=chapter&book=" +
 		worddata.book +
-		"&para=" +
+		"&par=" +
 		worddata.para +
 		"&direction=col' target='_blank'>";
 	html += worddata.title + "</a></div>";

+ 3 - 19
app/studio/js/render.js

@@ -1150,22 +1150,6 @@ function render_sent_tool_bar(elementBlock, begin) {
 	output += "<div class='sent_wbw_trans_bar'>";
 	let sentIdString = abook + "-" + aparagraph + "-" + iBegin + "-" + iEnd;
 	let sentIdStringLink = "{{" + sentIdString + "}}";
-	let sentReaderLink = "";
-	if (_display_sbs == 0) {
-		//逐段模式
-		sentReaderLink = "https://www.wikipali.org/app/reader/?view=para&book=" + abook + "&para=" + aparagraph;
-	} else {
-		//逐句模式
-		sentReaderLink =
-			"https://www.wikipali.org/app/reader/?view=sent&book=" +
-			abook +
-			"&para=" +
-			aparagraph +
-			"&begin=" +
-			iBegin +
-			"&end=" +
-			iEnd;
-	}
 
 	output += "<span style='flex: 7;display: flex;'>";
 	output += "<div style='background-color: silver;'>";
@@ -1189,11 +1173,11 @@ function render_sent_tool_bar(elementBlock, begin) {
 	let reader_open_link = "";
 	if (_display_sbs == 0) {
 		//逐段模式
-		reader_open_link = "../reader/?view=para&book=" + abook + "&para=" + aparagraph;
+		reader_open_link = "../reader/?view=para&book=" + abook + "&par=" + aparagraph;
 	} else {
 		//逐句模式
 		reader_open_link =
-			"../reader/?view=sent&book=" + abook + "&para=" + aparagraph + "&begin=" + iBegin + "&end=" + iEnd;
+			"../reader/?view=sent&book=" + abook + "&par=" + aparagraph + "&begin=" + iBegin + "&end=" + iEnd;
 	}
 	output +=
 		"<button class='icon_btn'  onclick=\"window.open('" +
@@ -1528,7 +1512,7 @@ function renderWordParBlockInner(elementBlock) {
 				output +=
 					"<button class='icon_btn'  onclick=\"window.open('../reader/?view=sent&book=" +
 					book +
-					"&para=" +
+					"&par=" +
 					paragraph +
 					"&begin=" +
 					nextBegin +

+ 1 - 1
app/studio/js/wizard.js

@@ -650,7 +650,7 @@ function explorer_show_res_list(book,para){
 			}
 			else{
 				arrResData[i].enable=true;
-				var read_link="../reader/?view=para&book="+arrResData[i].book+"&channal="+arrResData[i].album_id+"&para="+arrResData[i].paragraph;
+				var read_link="../reader/?view=para&book="+arrResData[i].book+"&channal="+arrResData[i].album_id+"&par="+arrResData[i].paragraph;
 				var check="<input type='checkbox' id='res_check_"+resCount+"' checked onclick=\"set_res_enable(this,"+i+")\" />";
 				html+=check+"["+arrResData[i].type+"]<a href='"+read_link+"' target='_blank'>"+arrResData[i].title+"</a>-"+arrResData[i].author;
 				resCount++;

+ 3 - 3
app/term/note.js

@@ -524,13 +524,13 @@ function note_ref_init() {
 	$("chapter").click(function () {
 		let bookid = $(this).attr("book");
 		let para = $(this).attr("para");
-		window.open("../reader/?view=chapter&book=" + bookid + "&para=" + para, "_blank");
+		window.open("../reader/?view=chapter&book=" + bookid + "&par=" + para, "_blank");
 	});
 
 	$("para").click(function () {
 		let bookid = $(this).attr("book");
 		let para = $(this).attr("para");
-		window.open("../reader/?view=para&book=" + bookid + "&para=" + para, "_blank");
+		window.open("../reader/?view=para&book=" + bookid + "&par=" + para, "_blank");
 	});
 }
 /*
@@ -1806,7 +1806,7 @@ function copy_ref(book, para, begin, end) {
 }
 
 function goto_nissaya(book, para, begin = 0, end = 0) {
-	window.open("../nissaya/index.php?book=" + book + "&para=" + para + "&begin=" + begin + "&end=" + end, "nissaya");
+	window.open("../nissaya/index.php?book=" + book + "&par=" + para + "&begin=" + begin + "&end=" + end, "nissaya");
 }
 function edit_in_studio(book, para, begin, end) {
 	wbw_channal_list_open(book, [para]);

+ 1 - 1
app/term/related_para.js

@@ -49,7 +49,7 @@ function related_para_dlg_render(para) {
 			output +=
 				"<a href='../reader/?view=chapter&book=" +
 				paraList[0].book +
-				"&para=" +
+				"&par=" +
 				paraList[0].para +
 				"' target='_blank'>" +
 				iterator.title +