nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Revert "Merge branch 'mjog/558-webkit-shared-process' into 'mainline'""

Browse source 
This reverts commit cbe6e0ba9b, which reinstates
commit e4a5b85698.

See !411 and !374
This commit is contained in:
Michael James Gratton 2020-08-25 22:10:28 +10:00
parent d0fff267f8
commit d7af23201c
28 changed files with 418 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ui/client-web-view-allow-remote-images.js
View file

@ -1,11 +0,0 @@
/*
* Copyright 2016 Michael Gratton <mike@vee.net>
*
* This software is licensed under the GNU Lesser General Public License
* (version 2.1 or later). See the COPYING file in this distribution.
*/
/**
* Enables remote image loading in a client web view.
*/
geary.allowRemoteImages = true;

5
ui/client-web-view.js → ui/components-web-view.js
View file

@ -6,7 +6,7 @@
*/
/**
* Application logic for ClientWebView and subclasses.
* Application logic for Components.WebView and subclasses.
*/
let PageState = function() {
@ -14,7 +14,6 @@ let PageState = function() {
};
PageState.prototype = {
init: function() {
this.allowRemoteImages = false;
this.isLoaded = false;
this.undoEnabled = false;
this.redoEnabled = false;
@ -108,7 +107,7 @@ PageState.prototype = {
window.webkit.messageHandlers.contentLoaded.postMessage(null);
},
loadRemoteImages: function() {
this.allowRemoteImages = true;
window._gearyAllowRemoteResourceLoads = true;
let images = document.getElementsByTagName("IMG");
for (let i = 0; i < images.length; i++) {
let img = images.item(i);

1
ui/conversation-message.ui
View file

@ -473,6 +473,7 @@
<object class="GtkRevealer" id="body_revealer">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_type">slide-up</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>

3
ui/org.gnome.Geary.gresource.xml
View file

@ -9,8 +9,7 @@
<file compressed="true" preprocess="xml-stripblanks">accounts_editor_servers_pane.ui</file>
<file compressed="true" preprocess="xml-stripblanks">application-main-window.ui</file>
<file compressed="true" preprocess="xml-stripblanks">certificate_warning_dialog.glade</file>
<file compressed="true">client-web-view.js</file>
<file compressed="true">client-web-view-allow-remote-images.js</file>
<file compressed="true">components-web-view.js</file>
<file compressed="true" preprocess="xml-stripblanks">components-attachment-pane.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-attachment-pane-menus.ui</file>
<file compressed="true" preprocess="xml-stripblanks">components-attachment-view.ui</file>