control_timer_fix.txt
1 |
=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.socket.js' |
---|---|
2 |
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.socket.js 2016-04-14 07:40:31 +0000 |
3 |
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.socket.js 2016-04-20 21:11:10 +0000 |
4 |
@@ -48,9 +48,12 @@ |
5 |
** or to refresh the web application page, added named message types constants, |
6 |
** fixed TypedArray.slice is unsupported by IE. |
7 |
** 017 HC 20160406 Overhaul of window-activation logic. |
8 |
-** 018 SBI 20160414 Added MSG_OPEN_URL to open the target page in the browser. Fixed the window |
9 |
+** 018 SBI 20160420 Added MSG_OPEN_URL to open the target page in the browser. Fixed the window |
10 |
** location coordinates to have 32 bits size if they are send with |
11 |
-** MSG_SET_WINDOW_LOC and MSG_WINDOW_RESIZED. |
12 |
+** MSG_SET_WINDOW_LOC and MSG_WINDOW_RESIZED. Fixed ControlTimer to start it |
13 |
+** again only if the timer has been done. |
14 |
+** |
15 |
+* |
16 |
*/ |
17 |
|
18 |
"use strict"; |
19 |
@@ -1972,11 +1975,11 @@ |
20 |
*/ |
21 |
function start() |
22 |
{ |
23 |
+ if (running) |
24 |
+ { |
25 |
+ return; |
26 |
+ } |
27 |
reset((new Date()).getTime()); |
28 |
- if (running) |
29 |
- { |
30 |
- return; |
31 |
- } |
32 |
timer = setInterval(check, period); |
33 |
running = true; |
34 |
} |
35 |
@@ -2151,8 +2154,8 @@ |
36 |
// try to reconnect within watchdog timeout if it is failed, then |
37 |
// the websocket server is down |
38 |
connectivityTimer.start(); |
39 |
- exitTheApplication = true; |
40 |
} |
41 |
+ exitTheApplication = true; |
42 |
} |
43 |
}; |
44 |
} |
45 |
|