FWD » Core Development » User Interface

=== modified file 'src/com/goldencode/p2j/ui/client/chui/driver/web/res/p2j.clipboard_helpers.js'

--- src/com/goldencode/p2j/ui/client/chui/driver/web/res/p2j.clipboard_helpers.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/chui/driver/web/res/p2j.clipboard_helpers.js	2015-07-31 17:40:15 +0000

@@ -10,8 +10,12 @@

 **

 ** -#- -I- --Date-- ------------------------------Description----------------------------------

 ** 001 GES 20150324 First version, with refactored content moved from tty.clipboard.js.

+** 002 SBI 20150731 Applied "use strict" directive, fixed undeclared variables

+**                  and corrected the selection rectangle coordinates.

 */

+"use strict";

+

 p2j.clipboard_helpers = (function() 

 {

    /** Clipboard helper object which will be returned from this initialization function. */

@@ -71,8 +75,8 @@

     */

    me.mouseDown = function(e) 

    {

-      var x = (e.pageX - this.offsetLeft) | 0;

-      var y = (e.pageY - this.offsetTop) | 0;

+      var x = (e.pageX - canvas.offsetLeft) | 0;

+      var y = (e.pageY - canvas.offsetTop) | 0;

       cells.startX = (x / charWidth) | 0;

       cells.startY = (y / charHeight) | 0;         

       rect.startX = cells.startX * charWidth;

@@ -87,8 +91,8 @@

     */

    me.mouseMove = function(e) 

    {

-      var x = (e.pageX - this.offsetLeft | 0);

-      var y = (e.pageY - this.offsetTop | 0);

+      var x = (e.pageX - canvas.offsetLeft) | 0;

+      var y = (e.pageY - canvas.offsetTop) | 0;

       cells.startX1 = (x / charWidth) | 0;

       cells.startY1 = (y / charHeight) | 0;

=== modified file 'src/com/goldencode/p2j/ui/client/chui/driver/web/res/p2j.screen.js'

--- src/com/goldencode/p2j/ui/client/chui/driver/web/res/p2j.screen.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/chui/driver/web/res/p2j.screen.js	2015-07-31 17:40:15 +0000

@@ -19,8 +19,12 @@

 ** 007 MAG 20140821 Extended color palette.

 ** 008 GES 20150325 Renamed objects to match the more generic web client approach (not just

 **                  ChUI). Moved some logic to common code locations.

+** 009 SBI 20150731 Applied "use strict" directive, fixed undeclared variables,

+**                  added end-lines on copy.

 */

+"use strict";

+

 p2j.screen = (function()

 {

    /** Screen object which will be returned from this initialization function. */

@@ -76,10 +80,10 @@

       {

          me.color = color;

          memo = new Array(rows);

-         for (i = 0; i < rows; i++)

+         for (var i = 0; i < rows; i++)

          {

             memo[i] = new Array(cols);

-            for (j = 0; j < cols; j++)

+            for (var j = 0; j < cols; j++)

             {

                var cell = {'c': ' ', 'f': 'white', 'b': 'black', 'a': 0, 'k': 0};

                cell.f = color.f;

@@ -97,9 +101,9 @@

        */

       me.clear = function(rows, cols)

       {

-         for (i = 0; i < rows; i++)

+         for (var i = 0; i < rows; i++)

          {

-            for (j = 0; j < cols; j++)

+            for (var j = 0; j < cols; j++)

             {

                var v = memo[i][j];

                v.c = ' ';

@@ -156,14 +160,17 @@

        */

       me.copy = function(begRow, endRow, begCol, endCol)

       {

-         var text = "";         

-         for (i = begRow; i <= endRow; i++)

+         var text = "";

+         for (var i = begRow; i <= endRow; i++)

          {

-            for (j = begCol; j <= endCol; j++)

+            for (var j = begCol; j <= endCol; j++)

             {

                text += memo[i][j].c;

             }

-         }         

+            if (i < endRow) {

+               text += "\n";//add end of line

+            }

+         }

          return text;

       };

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/index.html'

--- src/com/goldencode/p2j/ui/client/driver/web/index.html	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/index.html	2015-07-31 12:09:20 +0000

@@ -4,7 +4,6 @@

       <title>P2J ${client_title} Web Client</title>

       <link rel="stylesheet" type="text/css" href="/dojo-toolkit/dijit/themes/claro/claro.css">

-      

       <!-- load dojo -->      

       <script src="/dojo-toolkit/dojo/dojo.js" data-dojo-config="async: true"></script>  

@@ -17,11 +16,12 @@

       <script type="text/javascript" src="/client/p2j.clipboard_helpers.js"></script>

       <script type="text/javascript" src="/common/p2j.clipboard.js"></script>

-      <script>    

+      <script>

       require(["dojo"], function(dojo)

       {

          dojo.ready(function()

-         {               

+         {   

+            "use strict";

             p2j.init({

                'isGui' : ${isGui},

                'canvas' : {'id' : 'def_win', 'size' : {'${height_name}' : ${height_val}, '${width_name}' : ${width_val}}, 'mouse' : false},

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.clipboard.js'

--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.clipboard.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.clipboard.js	2015-07-31 17:40:15 +0000

@@ -14,8 +14,12 @@

 **                  can be used for both ChUI and GUI web clients. Client-specific portions have

 **                  been moved to p2j.clipboard_helpers which will have different versions for

 **                  ChUI and GUI.

+** 003 SBI 20150731 Applied "use strict" directive, fixed undeclared variables

+**                  and end of lines (EOLs) by simulating key "Enter" pressed.

 */

+"use strict";

+

 /**

  * Core clipboard implementation that calls client-specific callbacks for ChUI or GUI selection

  * and rendering.  The user drags the mouse to select text and the hooks are called to capture

@@ -69,13 +73,13 @@

       require(["dijit/Menu", "dijit/MenuItem", "dijit/CheckedMenuItem", "dijit/MenuSeparator", "dijit/PopupMenuItem"], 

       function(Menu, MenuItem, CheckedMenuItem, MenuSeparator, PopupMenuItem)

       {   

-         pMenu = new dijit.Menu(

+         var pMenu = new dijit.Menu(

          {

             targetNodeIds:[cfg.clipboard.id]

          });

          // select 

-         pMenuSelect = new dijit.CheckedMenuItem(

+         var pMenuSelect = new dijit.CheckedMenuItem(

          {

             iconClass:"dijitEditorIcon dijitEditorIconSelectAll",

             label: "Enable Clipboard",

@@ -196,21 +200,26 @@

    {

       if (text.length > 0)

       {

-         var msg = new Uint8Array(text.length * 2 + 1);

+         /**

+          *  Replace eol lines in order to be handled properly on the thin client

+          *  as it would be "Enter" pressed.

+          */

+         var text2 = text.replace(/\n/g,"\r");

+         var msg = new Uint8Array(text2.length * 2 + 1);

          msg[0] = 0x03;

-         for (var i = 0, j = 1;i < text.length;i++, j += 2)

+         for (var i = 0, j = 1;i < text2.length;i++, j += 2)

          {

-            var c = text.charCodeAt(i);

+            var c = text2.charCodeAt(i);

             msg[j + 1] = c & 0xff;

             c = c >> 8;

             msg[j] = c & 0xff;

          }

-         p2j.socket.send(msg); 

+         p2j.socket.send(msg.buffer); 

       }                     

    }

-

+   

    /**

     * Clipboard copy handler.

     * 

@@ -222,8 +231,8 @@

       if (!me.enabled)

          return;

-      // value to copy

-      var text = inputText.value;

+      // restore value to copy

+      var text = decodeURIComponent(inputText.value);

       // copy to clipboard

       if (window.clipboardData) 

@@ -255,7 +264,7 @@

          var text = p2j.clipboard_helpers.getSelectedText();

          // copy selection to clipboard

-         inputText.value = text;

+         inputText.value = encodeURIComponent(text); // to escape "\n"

          inputText.focus();

          inputText.select();

       }

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js'

--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.js	2015-07-31 17:40:15 +0000

@@ -14,8 +14,11 @@

 ** 003 MAG 20140702 Add tty.clipboard module.

 ** 004 GES 20150324 Moved this class to a common resource base and made it generic (so that it

 **                  can be used for both ChUI and GUI web clients.

+** 005 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.

 */

+"use strict";

+

 /**

  * Create a top-level JavaScript object (which acts as a namespace for the web client code)

  * and initialize all submodules.

@@ -31,7 +34,7 @@

  *    <li> p2j.clipboard

  * </ol>

  */

-p2j = (function()

+var p2j = (function()

 {

    /** The top-level web client object which will be returned from this function. */

    var me = {};

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js'

--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js	2015-07-31 17:40:15 +0000

@@ -16,8 +16,11 @@

 ** 005 MAG 20140701 Use CTRL-C and CTRL-V to copy/paste.

 ** 006 GES 20150324 Moved this class to a common resource base and made it generic (so that it

 **                  can be used for both ChUI and GUI web clients.

+** 007 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.

 */

+"use strict";

+

 p2j.keyboard = (function()

 {

    /** Keyboard object which will be returned from this initialization function. */

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js'

--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js	2015-07-31 17:40:15 +0000

@@ -13,80 +13,84 @@

 ** 002 MAG 20140228 Add javadoc.

 ** 003 GES 20150324 Moved this class to a common resource base and made it generic (so that it

 **                  can be used for both ChUI and GUI web clients.

+** 004 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.

 */

+"use strict";

+

 /**

  * Global definitions for common key values.

  */

-keys = 

-{

-   BACKSPACE: 8,

-   TAB: 9,

-   CLEAR: 12,

-   ENTER: 13,

-   SHIFT: 16,

-   CTRL: 17,

-   ALT: 18,

-   PAUSE: 19,

-   CAPS_LOCK: 20,

-   ESCAPE: 27,

-   SPACE: 32,

-   PAGE_UP: 33,

-   PAGE_DOWN: 34,

-   END: 35,

-   HOME: 36,

-   LEFT_ARROW: 37,

-   UP_ARROW: 38,

-   RIGHT_ARROW: 39,

-   DOWN_ARROW: 40,

-   INSERT: 45,

-   DELETE: 46,

-   HELP: 47,

-   LEFT_WINDOW: 91,

-   RIGHT_WINDOW: 92,

-   SELECT: 93,

-   NUMPAD_0: 96,

-   NUMPAD_1: 97,

-   NUMPAD_2: 98,

-   NUMPAD_3: 99,

-   NUMPAD_4: 100,

-   NUMPAD_5: 101,

-   NUMPAD_6: 102,

-   NUMPAD_7: 103,

-   NUMPAD_8: 104,

-   NUMPAD_9: 105,

-   NUMPAD_MULTIPLY: 106,

-   NUMPAD_PLUS: 107,

-   NUMPAD_ENTER: 108,

-   NUMPAD_MINUS: 109,

-   NUMPAD_PERIOD: 110,

-   NUMPAD_DIVIDE: 111,

-   F1: 112,

-   F2: 113,

-   F3: 114,

-   F4: 115,

-   F5: 116,

-   F6: 117,

-   F7: 118,

-   F8: 119,

-   F9: 120,

-   F10: 121,

-   F11: 122,

-   F12: 123,

-   F13: 124,

-   F14: 125,

-   F15: 126,

-   NUM_LOCK: 144,

-   SCROLL_LOCK: 145,

-   UP_DPAD: 175,

-   DOWN_DPAD: 176,

-   LEFT_DPAD: 177,

-   RIGHT_DPAD: 178

+var keys = {

+   BACKSPACE : 8,

+   TAB : 9,

+   CLEAR : 12,

+   ENTER : 13,

+   SHIFT : 16,

+   CTRL : 17,

+   ALT : 18,

+   PAUSE : 19,

+   CAPS_LOCK : 20,

+   ESCAPE : 27,

+   SPACE : 32,

+   PAGE_UP : 33,

+   PAGE_DOWN : 34,

+   END : 35,

+   HOME : 36,

+   LEFT_ARROW : 37,

+   UP_ARROW : 38,

+   RIGHT_ARROW : 39,

+   DOWN_ARROW : 40,

+   INSERT : 45,

+   DELETE : 46,

+   HELP : 47,

+   LEFT_WINDOW : 91,

+   RIGHT_WINDOW : 92,

+   SELECT : 93,

+   NUMPAD_0 : 96,

+   NUMPAD_1 : 97,

+   NUMPAD_2 : 98,

+   NUMPAD_3 : 99,

+   NUMPAD_4 : 100,

+   NUMPAD_5 : 101,

+   NUMPAD_6 : 102,

+   NUMPAD_7 : 103,

+   NUMPAD_8 : 104,

+   NUMPAD_9 : 105,

+   NUMPAD_MULTIPLY : 106,

+   NUMPAD_PLUS : 107,

+   NUMPAD_ENTER : 108,

+   NUMPAD_MINUS : 109,

+   NUMPAD_PERIOD : 110,

+   NUMPAD_DIVIDE : 111,

+   F1 : 112,

+   F2 : 113,

+   F3 : 114,

+   F4 : 115,

+   F5 : 116,

+   F6 : 117,

+   F7 : 118,

+   F8 : 119,

+   F9 : 120,

+   F10 : 121,

+   F11 : 122,

+   F12 : 123,

+   F13 : 124,

+   F14 : 125,

+   F15 : 126,

+   NUM_LOCK : 144,

+   SCROLL_LOCK : 145,

+   UP_DPAD : 175,

+   DOWN_DPAD : 176,

+   LEFT_DPAD : 177,

+   RIGHT_DPAD : 178

 };

 p2j.keymap = (function()

 {

-   /** Key mapping object which will be returned from this initialization function. */

+   /**

+    * Key mapping object which will be returned from this initialization function.

+    */

    var me = {};

    /* normal key mapping */   

@@ -94,7 +98,7 @@

    /* ALT key mapping */

    me.xlateAlt = {};         

-       

+   

    /**

     * Init function.

     */

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.socket.js'

--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.socket.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.socket.js	2015-07-31 17:40:15 +0000

@@ -17,8 +17,11 @@

 ** 006 MAG 20140402 Implements interactive child process mode.

 ** 007 GES 20150324 Moved this class to a common resource base and made it generic (so that it

 **                  can be used for both ChUI and GUI web clients.

+** 008 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.

 */

+"use strict";

+

 p2j.socket = (function()

 {

    /** Socket object which will be returned from this initialization function. */

=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.sound.js'

--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.sound.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.sound.js	2015-07-31 17:40:15 +0000

@@ -13,8 +13,11 @@

 ** 002 MAG 20140228 Add javadoc.

 ** 003 GES 20150324 Moved this class to a common resource base and made it generic (so that it

 **                  can be used for both ChUI and GUI web clients.

+** 004 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.

 */

+"use strict";

+

 p2j.sound = (function()

 {

    /** Sound object which will be returned from this initialization function. */

@@ -48,5 +51,5 @@

       }

    };

-   return me;       

+   return me;

 }());

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.clipboard_helpers.js'

--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.clipboard_helpers.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.clipboard_helpers.js	2015-07-31 17:40:15 +0000

@@ -10,8 +10,12 @@

 **

 ** -#- -I- --Date-- ------------------------------Description----------------------------------

 ** 001 GES 20150324 First version, with refactored content moved from tty.clipboard.js.

+** 002 SBI 20150731 Applied "use strict" directive, fixed undeclared variables

+**                  and corrected the selection rectangle coordinates.

 */

+"use strict";

+

 p2j.clipboard_helpers = (function() 

 {

    /** Clipboard helper object which will be returned from this initialization function. */

@@ -71,8 +75,8 @@

     */

    me.mouseDown = function(e) 

    {

-      var x = (e.pageX - this.offsetLeft) | 0;

-      var y = (e.pageY - this.offsetTop) | 0;

+      var x = (e.pageX - canvas.offsetLeft) | 0;

+      var y = (e.pageY - canvas.offsetTop) | 0;

       cells.startX = (x / charWidth) | 0;

       cells.startY = (y / charHeight) | 0;         

       rect.startX = cells.startX * charWidth;

@@ -87,8 +91,8 @@

     */

    me.mouseMove = function(e) 

    {

-      var x = (e.pageX - this.offsetLeft | 0);

-      var y = (e.pageY - this.offsetTop | 0);

+      var x = (e.pageX - canvas.offsetLeft) | 0;

+      var y = (e.pageY - canvas.offsetTop) | 0;

       cells.startX1 = (x / charWidth) | 0;

       cells.startY1 = (y / charHeight) | 0;

=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js'

--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js	2015-05-18 20:48:28 +0000

+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js	2015-07-31 17:40:15 +0000

@@ -12,8 +12,11 @@

 ** 001 GES 20150325 Created GUI version from ChUI version. Right now it is not functional.

 **                  Renamed objects to match the more generic web client approach (not just

 **                  ChUI). Moved some logic to common code locations.

+** 002 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.

 */

+"use strict";

+

 p2j.screen = (function()

 {

    /** Screen object which will be returned from this initialization function. */