Merge lp:~osomon/webbrowser-app/copy-image-to-clipboard into lp:webbrowser-app

[Olivier Tilloy]

Use new API in oxide 1.17 to copy image to clipboard.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1467
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/504/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/506/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/506
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/498/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial/498/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/504/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/copy-image-to-clipboard]

1468. By Olivier Tilloy on 2016-06-16

Bump dependency to oxide 1.17.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1468
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/539/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/626/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/626/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/539/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/copy-image-to-clipboard]

1469. By Olivier Tilloy on 2016-06-17

Merge latest changes from trunk and resolve minor conflicts.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1469
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/544/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/647/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/647
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/612
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/612
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/612
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/604/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/604/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/604/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/604/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/604
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/604/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/544/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/copy-image-to-clipboard]

1470. By Olivier Tilloy on 2016-10-04

Merge the latest changes from trunk, and resolve a minor conflict.

1471. By Olivier Tilloy on 2016-10-04

Revert import statements to 1.15: 1.17 isn’t exported as such as there haven’t been any new APIs since 1.15.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1471
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/675/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1736
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/420/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1736
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1582/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1582
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1582/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/675/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/copy-image-to-clipboard]

1472. By Olivier Tilloy on 2016-10-27

Merge the latest changes from trunk and resolve conflicts.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1472
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/717/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1912/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1913
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1752/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1752/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1752/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1752/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1752
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1752/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/717/rebuild

review: Needs Fixing (continuous-integration)

[Olivier Tilloy (osomon)]

In narrow layout, copying an image from the context menu crashes oxide.
Here is the stack trace:

#0 0x00007fffb62c7d7d in oxide::WebContextMenu::CopyImage () at ../../oxide/shared/browser/oxide_web_context_menu.cc:84
#1 0x00007fffc5317466 in ?? () from /usr/lib/x86_64-linux-gnu/libOxideQtQuick.so.0
#2 0x00007fffc5317eb6 in ?? () from /usr/lib/x86_64-linux-gnu/libOxideQtQuick.so.0
#3 0x00007fffc531825f in ?? () from /usr/lib/x86_64-linux-gnu/libOxideQtQuick.so.0
#4 0x00007ffff71f59e9 in QQmlObjectOrGadget::metacall (this=this@entry=0x7fffffffa370, type=type@entry=QMetaObject::InvokeMetaMethod, index=index@entry=5,
    argv=argv@entry=0x7fffffffa020) at qml/qqmlpropertycache.cpp:1557
#5 0x00007ffff71840b6 in CallMethod (object=..., index=5, returnType=returnType@entry=43, argCount=argCount@entry=0, argTypes=argTypes@entry=0x0,
    engine=engine@entry=0xc73470, callArgs=0x7fffc5e28390) at jsruntime/qv4qobjectwrapper.cpp:1143
#6 0x00007ffff7185227 in CallPrecise (object=..., data=..., engine=engine@entry=0xc73470, callArgs=callArgs@entry=0x7fffc5e28390)
    at jsruntime/qv4qobjectwrapper.cpp:1380
#7 0x00007ffff7185ded in QV4::QObjectMethod::callInternal (this=<optimized out>, callData=<optimized out>) at jsruntime/qv4qobjectwrapper.cpp:1858
#8 0x00007ffff719bfea in QV4::Object::call (d=0x7fffc5e28390, this=<optimized out>) at jsruntime/qv4object_p.h:324
#9 QV4::Runtime::callProperty (engine=0xc73470, nameIndex=<optimized out>, callData=0x7fffc5e28390) at jsruntime/qv4runtime.cpp:1002
#10 0x00007fff8c0c50c2 in ?? ()
#11 0x00007fff00000002 in ?? ()
#12 0x0000000000000008 in ?? ()
#13 0x00007fffffffa5f0 in ?? ()
#14 0x0000000000000028 in ?? ()
#15 0x00007fffb62c7cb8 in oxide::WebContextMenu::Close () at ../../oxide/shared/browser/oxide_web_context_menu.cc:77
#16 0x0000000000000000 in ?? ()

It appears that copyImage() is invoked after invoking close() on the menu context.

review: Needs Fixing

[lp:~osomon/webbrowser-app/copy-image-to-clipboard]

1473. By Olivier Tilloy on 2016-10-28

Delay closing the context model until after the action has been executed.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1473
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/719/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1916/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1917
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1756/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1756/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1756/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1756/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1756/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1756/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1756/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1756/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1756
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1756/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/719/rebuild

review: Needs Fixing (continuous-integration)

[lp:~osomon/webbrowser-app/copy-image-to-clipboard]

1474. By Olivier Tilloy on 2016-11-03

Replicate previous fix for the webapp container.

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1474
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/721/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1928/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1929
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1768
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1768/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1768/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1768/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1768
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1768/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1768/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1768
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1768/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1768
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1768/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1768/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1768/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-webbrowser-app-ci/721/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2016-08-29 16:34:14 +0000
+++ debian/control	2016-11-03 14:21:51 +0000
@@ -45,7 +45,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          fonts-liberation,
-         liboxideqt-qmlplugin (>= 1.15),
+         liboxideqt-qmlplugin (>= 1.17),
          libqt5sql5-sqlite,
          qml-module-qt-labs-folderlistmodel,
          qml-module-qt-labs-settings,
@@ -70,7 +70,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          fonts-liberation,
-         liboxideqt-qmlplugin (>= 1.8),
+         liboxideqt-qmlplugin (>= 1.17),
          libqt5sql5-sqlite,
          qml-module-qtquick2 (>= 5.4),
          qml-module-qtquick-window2 (>= 5.3),

=== modified file 'src/app/webbrowser/Browser.qml'
--- src/app/webbrowser/Browser.qml	2016-10-11 16:16:40 +0000
+++ src/app/webbrowser/Browser.qml	2016-11-03 14:21:51 +0000
@@ -19,10 +19,10 @@
 import QtQuick 2.4
 import QtQuick.Window 2.2
 import Qt.labs.settings 1.0
-import Ubuntu.Web 0.2
 import com.canonical.Oxide 1.15 as Oxide
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
+import Ubuntu.Web 0.2
 import Unity.InputInfo 0.1
 import webbrowserapp.private 0.1
 import webbrowsercommon.private 0.1

=== modified file 'src/app/webbrowser/ContextMenuMobile.qml'
--- src/app/webbrowser/ContextMenuMobile.qml	2016-09-19 12:08:03 +0000
+++ src/app/webbrowser/ContextMenuMobile.qml	2016-11-03 14:21:51 +0000
@@ -23,6 +23,8 @@
 import com.canonical.Oxide 1.8 as Oxide
 
 Popups.Dialog {
+    id: contextMenu
+
     property QtObject contextModel: model
     property ActionList actions: null
 
@@ -119,7 +121,7 @@
                 }
             }
 
-            onTriggered: contextModel.close()
+            onTriggered: contextMenu.hide()
         }
     }
 
@@ -138,7 +140,13 @@
             fontSize: "x-small"
             text: i18n.tr("Cancel")
         }
-        onTriggered: contextModel.close()
+        onTriggered: contextMenu.hide()
+    }
+
+    onVisibleChanged: {
+        if (!visible) {
+            contextModel.close()
+        }
     }
 
     // adjust default dialog visuals to custom requirements for the context menu

=== modified file 'src/app/webbrowser/TabComponent.qml'
--- src/app/webbrowser/TabComponent.qml	2016-10-11 16:17:11 +0000
+++ src/app/webbrowser/TabComponent.qml	2016-11-03 14:21:51 +0000
@@ -135,9 +135,10 @@
                 Actions.CopyImage {
                     objectName: "CopyImageContextualAction"
                     enabled: contextModel &&
-                             (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
-                             contextModel.srcUrl.toString()
-                    onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()])
+                             ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                              (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) &&
+                             contextModel.hasImageContents
+                    onTriggered: contextModel.copyImage()
                 }
                 Actions.SaveImage {
                     objectName: "SaveImageContextualAction"

=== modified file 'src/app/webcontainer/ContextMenuMobile.qml'
--- src/app/webcontainer/ContextMenuMobile.qml	2016-09-19 12:08:03 +0000
+++ src/app/webcontainer/ContextMenuMobile.qml	2016-11-03 14:21:51 +0000
@@ -23,6 +23,8 @@
 import com.canonical.Oxide 1.8 as Oxide
 
 Popups.Dialog {
+    id: contextMenu
+
     property QtObject contextModel: model
     property ActionList actions: null
 
@@ -121,7 +123,7 @@
                 }
             }
 
-            onTriggered: contextModel.close()
+            onTriggered: contextMenu.hide()
         }
     }
 
@@ -140,7 +142,13 @@
             fontSize: "x-small"
             text: i18n.tr("Cancel")
         }
-        onTriggered: contextModel.close()
+        onTriggered: contextMenu.hide()
+    }
+
+    onVisibleChanged: {
+        if (!visible) {
+            contextModel.close()
+        }
     }
 
     // adjust default dialog visuals to custom requirements for the context menu

=== modified file 'src/app/webcontainer/WebappWebview.qml'
--- src/app/webcontainer/WebappWebview.qml	2016-03-16 15:17:34 +0000
+++ src/app/webcontainer/WebappWebview.qml	2016-11-03 14:21:51 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.4
-import com.canonical.Oxide 1.8 as Oxide
+import com.canonical.Oxide 1.15 as Oxide
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Web 0.2
@@ -64,9 +64,10 @@
         }
         Actions.CopyImage {
             enabled: contextModel &&
-                     (contextModel.mediaType === Oxide.WebView.MediaTypeImage) &&
-                     contextModel.srcUrl.toString()
-            onTriggered: Clipboard.push(["text/plain", contextModel.srcUrl.toString()])
+                     ((contextModel.mediaType === Oxide.WebView.MediaTypeImage) ||
+                      (contextModel.mediaType === Oxide.WebView.MediaTypeCanvas)) &&
+                     contextModel.hasImageContents
+            onTriggered: contextModel.copyImage()
             objectName: "CopyImageContextualAction"
         }
         Actions.SaveImage {