Commit graph

208 commits

Author SHA1 Message Date
vladest
74c002d1f5 Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events 2017-11-30 12:52:26 +01:00
vladest
c8d864465f Merge branch 'master' into move_to_qqc2 2017-11-18 18:54:08 +01:00
vladest
b4f6c25f4d Implement QQC1-compatible Action component 2017-11-16 19:04:35 +01:00
Brad Davis
26a745be6f Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet 2017-11-15 11:59:06 -08:00
vladest
0e53afc346 Merge branch 'master' into move_to_qqc2 2017-11-15 20:53:14 +01:00
Dante Ruiz
b633968865 fix-bringing-up-logs 2017-11-15 10:47:06 -08:00
vladest
6b732804eb Button as QQC2 2017-11-13 21:15:31 +01:00
vladest
0c13c2b6e2 Remove unused QQC1 imports 2017-11-13 16:37:28 +01:00
Brad Davis
7bf1b176d7 Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem 2017-11-10 14:21:24 -08:00
beholder
eb4214fb4c add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard 2017-11-10 21:20:00 +03:00
vladest
567a219e9c Cleanup. Remove unused functionality 2017-10-28 12:01:37 +02:00
vladest
6fb1a9954e Merge branch 'master' into fix_google_vr_height 2017-10-28 10:35:29 +02:00
Dante Ruiz
92f765fe52 property set echomode for keyboard for wallet and webviews 2017-10-24 13:53:50 -07:00
vladest
f524f8a50f Remove commented code 2017-10-13 12:56:08 +02:00
vladest
9a92b5635d Fix too wide web view 2017-10-05 15:17:37 +02:00
vladest
1860a2cb16 Experimentsl CSS injector 2017-09-14 14:40:22 +02:00
vladest
1ccf2ef690 Merge branch 'master' into fix_google_vr_height 2017-09-12 22:51:54 +02:00
vladest
92a83328c0 Follow naming convention 2017-09-12 19:17:49 +02:00
vladest
58c0141f27 Remove unnecessary code 2017-09-12 19:00:00 +02:00
vladest
08deba35ae Take in account current WebEngine profile to make sure all features are in place, like download 2017-09-12 16:22:53 +02:00
vladest
17a923b9de Temporarily disable WebView flickable until new solution will be investigated 2017-09-12 15:48:47 +02:00
vladest
00038664a6 Merge branch 'master' into fix_google_vr_height 2017-09-11 19:43:10 +02:00
vladest
c6d3bce704 Switch off Flickable 2017-09-10 18:33:04 +02:00
vladest
31a23acb1a Add flickable on mouse wheel to web pages 2017-09-06 23:04:58 +02:00
vladest
85a3771a98 Remove commented out code 2017-09-05 22:19:38 +02:00
vladest
a80d9a22df Added option to disable flickable for web view 2017-08-31 12:20:20 +02:00
vladest
88b045e3a9 Switched off overboundings. More accurate calculate height 2017-08-30 20:17:11 +02:00
vladest
e38075f7ba Disable web engine scrollbars 2017-08-28 16:27:33 +02:00
vladest
36879f83eb Added scroll bar. Cleanup 2017-08-25 15:44:07 +02:00
vladest
d6079e70fb Binding to width to make sure it will follow Tablet with when rotating 2017-08-24 23:44:53 +02:00
vladest
c7fe845403 Move common webview flickable code to separate core file 2017-08-24 21:35:47 +02:00
vladest
43d3544a0d Fix width of html pages in Create mode 2017-08-21 17:07:24 +02:00
vladest
9fd2a742a9 Fix QML warning. Fix AddressBar info scroll 2017-08-21 16:45:47 +02:00
vladest
3be684b973 Fixed spinner in center. Flicking only vertically 2017-08-21 16:31:25 +02:00
vladest
78e9bb6020 almost works for marketplace 2017-08-20 23:06:23 +02:00
vladest
56dedea66c 1st experimental approach 2017-08-20 17:57:14 +02:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2
Asynchronous Ledger Interactions with Server
2017-08-18 15:40:24 -07:00
howard-stearns
bd37679b65 working 2017-08-18 14:03:40 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
Elisa Lupin-Jimenez
6c2bf63392 Back button works 2017-08-10 17:51:19 -07:00
Cain Kilgore
2f857a6d1a Forgot a file 2017-07-25 06:05:06 +01:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
David Rowe
bc4af86b57 Display spinner in Web controls when they're loading an HTTP page 2017-05-23 15:40:35 +12:00
David Rowe
116175cf9f Fix going back from Twitter password recovery page 2017-05-09 09:03:48 +12:00
David Rowe
1b26ba22cb Fix browser history in goto "i" pages on tablet 2017-05-06 11:13:13 +12:00
David Rowe
88dc6b5f61 Fix tablet Web view "back" button not greying out when disabled 2017-05-05 17:24:36 +12:00
David Rowe
30604ab901 Fix some typos noticed in passing 2017-05-04 16:56:18 +12:00
David Rowe
9d92ed2b9b Fix keyboard not appearing in social media snapshot sharing dialogs 2017-05-04 16:55:10 +12:00
David Rowe
8ae3d4e8a0 Merge branch 'master' into 21314
# Conflicts:
#	interface/resources/qml/controls/TabletWebView.qml
2017-05-04 13:10:09 +12:00
Zach Fox
affc7fc654 Merge pull request #10369 from druiz17/url-fix
Fix tablet webview showing incorrect url.
2017-05-03 16:58:06 -07:00
Dante Ruiz
5390a29859 tabletwebview-url-fix 2017-05-03 23:05:05 +01:00
David Rowe
7fdcb9b1f0 Fix numeric keys not displaying in social media sharing dialogs 2017-05-03 14:59:41 +12:00
David Rowe
7b387c52c3 Fix reliability of keyboard enabling in tablet Web pages 2017-05-03 14:42:06 +12:00
Dante Ruiz
a08b55d5f5 minimize diff 2017-05-01 23:08:25 +01:00
Dante Ruiz
64b8237bd6 fix twitter and facebook links 2017-05-01 22:45:13 +01:00
Dante Ruiz
62870d85d3 Merge branch 'webview-js' of github.com:druiz17/hifi into tabletwebview-fix-links 2017-05-01 21:58:09 +01:00
Dante Ruiz
bb9eb98625 prevent mouse events from propagating to far 2017-05-01 21:49:57 +01:00
Dante Ruiz
c205bf0980 working on cleaner navigation 2017-05-01 21:23:38 +01:00
Dante Ruiz
9f33af479d saving work 2017-05-01 18:04:22 +01:00
druiz17
f60deb0cfc fixed the twitter link 2017-04-30 22:55:44 -07:00
druiz17
2bf7b12c7d open webview from tabletwebscreen 2017-04-30 15:27:34 -07:00
Dante Ruiz
59f84a60c5 saving work 2017-04-29 00:31:09 +01:00
Dante Ruiz
851eece0e4 removed comments 2017-04-25 23:26:16 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Dante Ruiz
9c79e62004 webview-fix 2017-04-11 18:49:40 +01:00
Seth Alves
aa89903a9f Merge pull request #10160 from vladest/tabletwebview-yahoo-fix
Yahoo, Reddit etc now works correctly
2017-04-08 20:25:18 -07:00
Seth Alves
03065ee6c8 Merge pull request #9938 from kunalgosar/jsRenderBug
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
Vladyslav Stelmakhovskyi
a1892b351f Cant use underscores outside class internals 2017-04-07 19:40:46 +02:00
Vladyslav Stelmakhovskyi
f88ba7bc57 Yahoo, Reddit etc now works correctly 2017-04-07 15:45:33 +02:00
Vladyslav Stelmakhovskyi
16fa7988f6 TabletWebView redesigned to single WebView instance 2017-04-06 17:53:46 +02:00
kunalgosar
8749428ede dont assume no query tags 2017-04-04 13:51:34 -07:00
Kunal Gosar
e5c075f107 fix typo and namespace 2017-04-04 11:54:58 -07:00
kunalgosar
9d0667cb31 add url tag to web entities 2017-04-04 11:54:58 -07:00
kunalgosar
19ab7526d3 apply profile to relevant entities 2017-04-04 11:54:21 -07:00
kunalgosar
a0f0879087 added file type filter and interceptor 2017-04-04 11:54:21 -07:00
Dante Ruiz
3090629f77 clean up code 2017-04-03 18:51:39 +01:00
Chris Collins
cc8b52fff4 Merge pull request #10095 from druiz17/tablet-webView2.0
Tablet webview now uses mobile format
2017-04-01 08:33:09 -07:00
Dante Ruiz
7ca7ad5e0b removed junk file 2017-04-01 01:53:00 +01:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2
PAL v2.0
2017-03-31 17:00:41 -07:00
Dante Ruiz
d1bf3e4bf2 fixed webview mobile view 2017-04-01 00:58:09 +01:00
Dante Ruiz
9658e1b8ac better web view handling 2017-03-31 19:25:03 +01:00
Dante Ruiz
b6901bba3e added tabletWebView.qml 2017-03-31 18:48:08 +01:00
Dante Ruiz
8f402c73b0 saving work 2.0 2017-03-31 01:18:31 +01:00
Dante Ruiz
cb8660c699 saving work 2017-03-30 01:34:14 +01:00
Zach Fox
0506fc0033 New goTo() behavior; Fix goBack 2017-03-20 12:55:38 -07:00
Zach Fox
05fec328c0 Make tablet popups work like they should 2017-03-16 10:38:46 -07:00
David Rowe
a8a04cfbba Add script injection to Web 3D overlay 2016-12-05 12:19:49 +13:00
Anthony J. Thibault
1fc310434e Fix for crash in QtWebEngineCore when rapidly switching domains
Call stop on the QWebEngineView before destroying OffscreenQMLSurface.
2016-10-27 18:55:24 -07:00
Stephen Birarda
3cbdf13931 add intercepted profile to uit WebView 2016-10-17 15:04:33 -07:00
Stephen Birarda
3ce47631b7 move the intercepted web engine profile to BaseWebView 2016-10-17 14:25:59 -07:00
David Rowe
e269a84d0e Add placeholder "FIXME"s for making Web entity keyboard HMD-only 2016-10-13 09:35:39 +13:00
David Rowe
827c2b015b Update other dialogs to use single keyboard QML file 2016-10-09 11:52:30 +13:00
David Rowe
b954852ba9 Use temporary copy of keyboard QML file while refactoring 2016-10-08 15:23:11 +13:00
David Rowe
023efe05f0 Move keyboard QML files 2016-09-25 09:54:48 +13:00
Seth Alves
4470338663 catagorize some qDebugs 2016-09-14 21:39:45 -07:00
Anthony J. Thibault
d38625ce2a Coding standard fix for JS portions of QML.
Semicolons at end of line.
2016-09-08 18:16:32 -07:00
Anthony J. Thibault
ebb4c0990b Removed local copy of qtwebchannel.js, use qt resource version instead 2016-09-07 17:14:33 -07:00