Merge pull request #325 from guycalledfrank/enterkey

fix ENTER keycode
playcanvas · Jun 18, 2015 · b68e82a · b68e82a
2 parents c4e1bfe + 1459411
commit b68e82a
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/src/input/input_input.js b/src/input/input_input.js
@@ -72,9 +72,9 @@
         /**
         * @enum pc.EVENT
         * @name pc.EVENT_TOUCHCANCEL
-        * @description Name of event fired when a touch point is interupted in some way. 
-        * The exact reasons for cancelling a touch can vary from device to device. 
-        * For example, a modal alert pops up during the interaction; the touch point leaves the document area; 
+        * @description Name of event fired when a touch point is interupted in some way.
+        * The exact reasons for cancelling a touch can vary from device to device.
+        * For example, a modal alert pops up during the interaction; the touch point leaves the document area;
         * or there are more touch points than the device supports, in which case the earliest touch point is canceled.
         */
         EVENT_TOUCHCANCEL: 'touchcancel',
@@ -98,7 +98,7 @@
          * @enum pc.KEY
          * @name pc.KEY_ENTER
          */
-        KEY_ENTER: 14,
+        KEY_ENTER: 13,
         /**
          * @enum pc.KEY
          * @name pc.KEY_SHIFT
@@ -599,111 +599,111 @@
          */
         MOUSEBUTTON_RIGHT: 2,
 
-        /** 
+        /**
         * @description Index for pad 1
         */
         PAD_1: 0,
-        /** 
+        /**
         * @description Index for pad 2
         */
         PAD_2: 1,
-        /** 
+        /**
         * @description Index for pad 3
         */
         PAD_3: 2,
-        /** 
+        /**
         * @description Index for pad 4
         */
         PAD_4: 3,
 
-        /** 
+        /**
         * @description The first face button, from bottom going clockwise
         */
         PAD_FACE_1: 0,
-        /** 
+        /**
         * @description The second face button, from bottom going clockwise
         */
         PAD_FACE_2: 1,
-        /** 
+        /**
         * @description The third face button, from bottom going clockwise
         */
         PAD_FACE_3: 2,
-        /** 
+        /**
         * @description The fourth face button, from bottom going clockwise
         */
         PAD_FACE_4: 3,
 
 
-        /** 
+        /**
         * @description The first shoulder button on the left
         */
         PAD_L_SHOULDER_1: 4,
-        /** 
+        /**
         * @description The first shoulder button on the right
         */
         PAD_R_SHOULDER_1: 5,
-        /** 
+        /**
         * @description The second shoulder button on the left
         */
         PAD_L_SHOULDER_2: 6,
-        /** 
+        /**
         * @description The second shoulder button on the right
         */
         PAD_R_SHOULDER_2: 7,
 
-        /** 
+        /**
         * @description The select button
         */
         PAD_SELECT: 8,
-        /** 
+        /**
         * @description The start button
         */
         PAD_START: 9,
 
-        /** 
+        /**
         * @description The button when depressing the left analogue stick
         */
         PAD_L_STICK_BUTTON: 10,
-        /** 
+        /**
         * @description The button when depressing the right analogue stick
         */
         PAD_R_STICK_BUTTON: 11,
 
-        /** 
+        /**
         * @description Direction pad up
         */
         PAD_UP: 12,
-        /** 
+        /**
         * @description Direction pad down
         */
         PAD_DOWN: 13,
-        /** 
+        /**
         * @description Direction pad left
         */
         PAD_LEFT: 14,
-        /** 
+        /**
         * @description Direction pad right
         */
         PAD_RIGHT: 15,
 
-        /** 
+        /**
         * @description Vendor specific button
         */
         PAD_VENDOR: 16,
 
-        /** 
+        /**
         * @description Horizontal axis on the left analogue stick
         */
         PAD_L_STICK_X: 0,
-        /** 
+        /**
         * @description Vertical axis on the left analogue stick
         */
         PAD_L_STICK_Y: 1,
-        /** 
+        /**
         * @description Horizontal axis on the right analogue stick
         */
         PAD_R_STICK_X: 2,
-        /** 
+        /**
         * @description Vertical axis on the right analogue stick
         */
         PAD_R_STICK_Y: 3