Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js

Seth Alves committed 9 years ago

Commit 610c20e2 parents c725393 e72338538 files · +788 −453Browse files

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

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+1−0

@@ -394,6 +394,7 @@ void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaS · 393 unmodified lines
394	}	394	}
395		395
396	if (root) {	396	if (root) {
		397	removeButtonsFromHomeScreen();
397	QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));	398	QMetaObject::invokeMethod(root, "loadSource", Q_ARG(const QVariant&, QVariant(WEB_VIEW_SOURCE_URL)));
398	QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));	399	QMetaObject::invokeMethod(root, "setShown", Q_ARG(const QVariant&, QVariant(true)));
399	QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));	400	QMetaObject::invokeMethod(root, "loadWebUrl", Q_ARG(const QVariant&, QVariant(url)), Q_ARG(const QVariant&, QVariant(injectedJavaScriptUrl)));