|
1
|
=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js'
|
|
2
|
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js 2015-12-15 22:34:23 +0000
|
|
3
|
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js 2015-12-16 20:43:57 +0000
|
|
4
|
@@ -20,7 +20,7 @@
|
|
5
|
** 007 SBI 20150901 Modifications to initialization order.
|
|
6
|
** 008 SBI 20151020 Increased logging buffer size.
|
|
7
|
** 009 SBI 20151215 Fixed to take into an account that for Chrome an element style object has only
|
|
8
|
-** the "getter" access function. Changed to detect Chrome.
|
|
9
|
+** the "getter" access function. Changed to detect Chrome, IE11 and IE12 (Edge).
|
|
10
|
*/
|
|
11
|
|
|
12
|
"use strict";
|
|
13
|
@@ -53,9 +53,11 @@
|
|
14
|
|
|
15
|
/** Browser detection flags. */
|
|
16
|
me.isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
|
|
17
|
- me.isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
|
|
18
|
+ me.isChrome = navigator.userAgent.toLowerCase().indexOf('chrome') > -1;
|
|
19
|
me.isChromium = !!window.chrome;
|
|
20
|
- me.isIe = !!window.ActiveXObject;
|
|
21
|
+ me.isIE11 = navigator.userAgent.indexOf("Trident") > -1
|
|
22
|
+ || navigator.userAgent.indexOf("Edge") > -1;
|
|
23
|
+ me.isIe = !!window.ActiveXObject || me.isIE11;
|
|
24
|
|
|
25
|
/** The default container element (if specified), or <code>document.body</code>. */
|
|
26
|
var container = null;
|
|
27
|
|
|
28
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.virtual_desktop.js'
|
|
29
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.virtual_desktop.js 2015-12-15 19:53:13 +0000
|
|
30
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.virtual_desktop.js 2015-12-16 20:54:45 +0000
|
|
31
|
@@ -12,7 +12,7 @@
|
|
32
|
** 001 SBI 20150906 The virtual desktop to create task bar and drop zones.
|
|
33
|
** 002 SBI 20151020 Fix for disabling old task icons.
|
|
34
|
** 003 SBI 20151215 Fixed to take into an account that for Chrome an element style object has only
|
|
35
|
-** the "getter" access function.
|
|
36
|
+** the "getter" access function, to check IE if drag is starting.
|
|
37
|
*/
|
|
38
|
|
|
39
|
"use strict";
|
|
40
|
@@ -922,9 +922,15 @@
|
|
41
|
*/
|
|
42
|
function startDragging(event)
|
|
43
|
{
|
|
44
|
- event.dataTransfer.setData('text/plain',null);
|
|
45
|
+ if (!p2j.isIe)
|
|
46
|
+ {
|
|
47
|
+ event.dataTransfer.setData('text/plain', null);
|
|
48
|
+ }
|
|
49
|
dragged = event.target;
|
|
50
|
- event.target.style.opacity = DRAGGED_OPACITY;
|
|
51
|
+ p2j.setStyleForElement(event.target,
|
|
52
|
+ {
|
|
53
|
+ opacity : DRAGGED_OPACITY
|
|
54
|
+ });
|
|
55
|
}
|
|
56
|
|
|
57
|
/**
|
|
58
|
@@ -936,7 +942,10 @@
|
|
59
|
*/
|
|
60
|
function dragEnded(event)
|
|
61
|
{
|
|
62
|
- event.target.style.opacity = 1;
|
|
63
|
+ p2j.setStyleForElement(event.target,
|
|
64
|
+ {
|
|
65
|
+ opacity : 1
|
|
66
|
+ });
|
|
67
|
}
|
|
68
|
|
|
69
|
/**
|
|
70
|
@@ -952,7 +961,13 @@
|
|
71
|
/**
|
|
72
|
* events fired on the drop targets
|
|
73
|
*/
|
|
74
|
- document.addEventListener("dragover", function(event) { event.preventDefault(); }, false);
|
|
75
|
+ document.addEventListener(
|
|
76
|
+ "dragover",
|
|
77
|
+ function(event)
|
|
78
|
+ {
|
|
79
|
+ event.stopPropagation();
|
|
80
|
+ event.preventDefault();
|
|
81
|
+ }, false);
|
|
82
|
|
|
83
|
/**
|
|
84
|
* The dragged task panel enters the drop zone
|
|
85
|
|