修复找不到formathtml的bug

Change-Id: I408495d6fd3c54f2503864f7036834a0c579fa07
0312birdzhang · Apr 3, 2018 · c9ecf04 · c9ecf04
1 parent fd597b9
commit c9ecf04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/qml/harbour-sailfishclub.qml b/qml/harbour-sailfishclub.qml
@@ -781,7 +781,7 @@ ApplicationWindow
 
     Component.onCompleted: {
         Main.signalcenter = signalCenter;
-//        page_size = settings.get_pagesize();
+        JS.app = appwindow;
     }
 
 }

diff --git a/qml/js/main.js b/qml/js/main.js
@@ -1,6 +1,7 @@
 .pragma library
 
 var py;
+var app;
 // login function
 function login(uid, token, username, password){
     if(uid && token){
@@ -13,7 +14,7 @@ function login(uid, token, username, password){
 
 function splitContent(topic_content, parent) {
     var model = Qt.createQmlObject('import QtQuick 2.0; ListModel {}', parent);
-    topic_content = formathtml(topic_content);
+    topic_content = app.formathtml(topic_content);
     topic_content = topic_content.replace(/<a[^<>]*href=\"([^<>"]*)\"\s+rel=\"nofollow\"><img\s+src=\"([^<>"]*)\".*?a>/g,"<img src=\"$2\" />"); //去掉图片上的超链接
     topic_content = topic_content.replace(/<img[^<>]*class=\"[^<>]*emoji-emoji-one[^<>]*\"[^<>]*alt=\"([^<>"]*)\"[^<>]*\/>/g,"$1"); // emoji 直接用图片alt中的
     var img_model = [];