History

clara.io marketplace works on tablet

Anthony J. Thibault committed 9 years ago

Commit 56fc42a1 parent c212fc94 files · +64 −108Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+6−1
@@ -117,6 +117,10 @@ void TabletProxy::gotoHomeScreen() { · 116 unmodified lines
117}117}
118 118
119void TabletProxy::gotoWebScreen(const QString& url) {119void TabletProxy::gotoWebScreen(const QString& url) {
120 gotoWebScreen(url, "");
121}
122
123void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl) {
120 if (_qmlTabletRoot) {124 if (_qmlTabletRoot) {
121 if (_state == State::Home) {125 if (_state == State::Home) {
122 removeButtonsFromHomeScreen();126 removeButtonsFromHomeScreen();
@@ -125,7 +129,8 @@ void TabletProxy::gotoWebScreen(const QString& url) { · 2 unmodified lines
125 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));129 QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
126 _state = State::Web;130 _state = State::Web;
127 }131 }
128 QMetaObject::invokeMethod(_qmlTabletRoot, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)));132 QMetaObject::invokeMethod(_qmlTabletRoot, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)),
133 Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));
129 }134 }
130}135}
131 136