rsence 2.1.5 → 2.1.6

data/VERSION

@@ -1 +1 @@
-2.1.5
+2.1.6

data/js/core/elem/elem.js

@@ -12,6 +12,12 @@
 var//RSence.Core
 BROWSER_TYPE = {
   
+/* Any browser on Mac OS X */
+  mac: false,
+  
+/* Any browser on Windows */
+  win: false,
+  
 /* Any version of Microsoft Internet Explorer */
   ie: false,
   
@@ -1289,6 +1295,9 @@ ELEM = {
     _browserType.ie8      = _isIE && (_ua.indexOf("MSIE 8") !== -1);
     _browserType.ie9      = _isIE && (_ua.indexOf("MSIE 9") !== -1);
     
+    _browserType.mac      = (_ua.indexOf("Macintosh") !== -1);
+    _browserType.win      = (_ua.indexOf("Windows") !== -1);
+    
     // Experimental; don't treat IE9 as an IE at all.
     // NOTE: IE9 Beta does still not behave like a standard web browser.
     //       It will probably require as much tuning as earlier IE versions.

data/js/foundation/control/eventresponder/eventresponder.js

@@ -118,6 +118,8 @@ HEventResponder = HClass.extend({
   *                 method for it is +keyDown+ and it receives the ascii key
   *                 code whenever a keyboard key is pressed. Can also be
   *                 toggled separately by using the +setKeyDown+ method.
+  *                 Also supports special mode 'repeat', when listening to
+  *                 key repetitions is needed.
   * +keyUp+::       The local +keyUp+ event state. The component receives
   *                 this event only if it's focused. The event responder
   *                 method for it is +keyUp+ and it receives the ascii key
@@ -361,7 +363,8 @@ HEventResponder = HClass.extend({
   *
   * = Parameters
   * +_flag+:: Set the keyDown event listening on/off (true/false) for
-  *           the component instance.
+  *           the component instance. Also supports special mode 'repeat',
+  *           when listening to key repetitions is needed.
   *
   * = Returns
   * +self+

data/js/foundation/eventmanager/eventmanager.js

@@ -149,7 +149,10 @@ EVENT = {
     Event.observe( _globalEventTargetElement, 'click', _this.click );
     Event.observe( _globalEventTargetElement, 'keyup', _this.keyUp );
     Event.observe( _globalEventTargetElement, 'keydown', _this.keyDown );
-    Event.observe( _globalEventTargetElement, 'keypress', _this.keyPress );
+    // IE and WebKit browsers don't need keyPress for repeat
+    if( !BROWSER_TYPE.safari && !BROWSER_TYPE.ie){
+      Event.observe( _globalEventTargetElement, 'keypress', _this.keyPress );
+    }
     Event.observe( _globalEventTargetElement, 'contextmenu', _this.contextMenu );
     Event.observe( _globalEventTargetElement, 'resize', _this.resize );
     Event.observe( _globalEventTargetElement, 'mousewheel', _this.mouseWheel );
@@ -857,36 +860,85 @@ EVENT = {
   },
 
 
+/** Mid-level mouse scroll wheel event manager.
+  * Delegates mouseWheel calls to the high-level event receivers of all
+  * controls registered for that event.
+  **/
+  mouseWheel: function(e) {
+    var _this = EVENT,
+        _delta = 0,
+        i = 0;
+    if (!e) {
+      e = window.event;
+    }
+    if (e.wheelDelta) {
+      _delta = 0 - (e.wheelDelta / 120);
+    }
+    else if (e.detail) {
+      _delta = 0 - (e.detail / 3);
+    }
+    if (BROWSER_TYPE.opera || BROWSER_TYPE.safari) {
+      _delta = 0 - _delta;
+    }
+    for (; i !== _this.focused.length; i++) {
+      if (_this.focused[i] === true) {
+        if (_this.focusOptions[i].mouseWheel === true) {
+          Event.stop(e);
+          _this.focusOptions[i].ctrl.mouseWheel(_delta);
+        }
+      }
+    }
+  },
+  
+  /* Alternative right button detection, wrapper for the mouseDown method */
+  contextMenu: function(e) {
+    // EVENT.mouseDown(e, false);
+    Event.stop(e);
+    
+    /***
+    
+    IMPLEMENT SEPARATE CONTEXT-MENU EVENT HANDLING HERE
+    
+    ***/
+    
+    // if(Event.isLeftClick(e)){
+    //   EVENT.status[EVENT.button2] = false;
+    // }
+  },
+
+
 /** Mid-level key press manager.
   * Gets called on the onKeyDown event.
   * Delegates keyDown calls to the high-level event receivers of all
   * controls registered for that event.
   **/
   keyDown: function(e) {
-    var _this = EVENT,
-        _theKeyCode = e.keyCode,
-        _keyDownStateForActiveControl = _this.activeControl?(_this.focusOptions[_this.activeControl.elemId]?_this.focusOptions[_this.activeControl.elemId].keyDown:false):false,
-        _repeat = (_keyDownStateForActiveControl === 'repeat'),
-        _stopEvent = false;
+    var
+    _this = EVENT,
+    _keyCode = _this.translateKeyCodes(e.keyCode),
+    _keyDownStateForActiveControl = _this.activeControl?(_this.focusOptions[_this.activeControl.elemId]?_this.focusOptions[_this.activeControl.elemId].keyDown:false):false,
+    _repeat = (_keyDownStateForActiveControl === 'repeat'),
+    _stopEvent = false;
     _this._modifiers(e);
-    if(!_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
+    _this._lastKeyPressTime = new Date().getTime();
+    if(!_this.status[_this.cmdKeyDown] && _this._detectCmdKey(_keyCode)){
       _this.status[_this.cmdKeyDown] = true;
     }
     if (_this.activeControl && _keyDownStateForActiveControl) {
-      if ((_this._lastKeyDown !== _theKeyCode) || _repeat) {
-        if(_this.activeControl.keyDown(_theKeyCode)){
+      if ((_this._lastKeyDown !== _keyCode) || _repeat) {
+        if(_this.activeControl.keyDown(_keyCode)){
           _stopEvent = true;
         }
       }
     }
     // Insert key to the realtime array, remove in keyUp
-    if (_this.status[_this.keysDown].indexOf(_theKeyCode) === -1) {
-      _this.status[_this.keysDown].push(_theKeyCode);
+    if (_this.status[_this.keysDown].indexOf(_keyCode) === -1) {
+      _this.status[_this.keysDown].push(_keyCode);
     }
     if (!_this.status[_this.cmdKeyDown] && _stopEvent){
       Event.stop(e);
     }
-    _this._lastKeyDown = _theKeyCode;
+    _this._lastKeyDown = _keyCode;
   },
 
 
@@ -898,17 +950,18 @@ EVENT = {
   * registered for that event.
   **/
   keyUp: function(e) {
-    var _this = EVENT,
-        _theKeyCode = e.keyCode,
-        _keyCodeIndex,
-        i = 0,
-        _stopEvent = false,
-        _ctrlId,
-        _ctrl;
+    var
+    _this = EVENT,
+    _keyCode = _this.translateKeyCodes(e.keyCode),
+    _keyCodeIndex,
+    i = 0,
+    _stopEvent = false,
+    _ctrlId,
+    _ctrl;
     _this._modifiers(e);
     _this._lastKeyDown = null;
     if (_this.activeControl && _this.activeControl.elemId && _this.focusOptions[_this.activeControl.elemId].keyUp === true) {
-      if(_this.activeControl.keyUp(_theKeyCode)){
+      if(_this.activeControl.keyUp(_keyCode)){
         _stopEvent = true;
       }
     }
@@ -924,81 +977,136 @@ EVENT = {
     if (!_this.status[_this.cmdKeyDown] && _stopEvent){
       Event.stop(e);
     }
-    if(_this.status[_this.cmdKeyDown] && _this._detectCmdKey(e.keyCode)){
+    if(_this.status[_this.cmdKeyDown] && _this._detectCmdKey(_keyCode)){
       _this.status[_this.cmdKeyDown] = false;
     }
     // Remove the key from the realtime array, inserted in keyDown
-    _keyCodeIndex = _this.status[_this.keysDown].indexOf(_theKeyCode);
+    _keyCodeIndex = _this.status[_this.keysDown].indexOf(_keyCode);
     if (_keyCodeIndex !== -1) {
       _this.status[_this.keysDown].splice(_keyCodeIndex, 1);
     }
   },
 
-  /* Using keyPress as an alias for the keyDown event */
+  /* The keyPress itself is ignored per se and used only as a repetition event for the last keyDown. */
   keyPress: function(e) {
-    var _this = EVENT;
-    _this.keyDown(e);
-  },
-
-
-/** Mid-level mouse scroll wheel event manager.
-  * Delegates mouseWheel calls to the high-level event receivers of all
-  * controls registered for that event.
-  **/
-  mouseWheel: function(e) {
-    var _this = EVENT,
-        _delta = 0,
-        i = 0;
-    if (!e) {
-      e = window.event;
-    }
-    if (e.wheelDelta) {
-      _delta = 0 - (e.wheelDelta / 120);
-    }
-    else if (e.detail) {
-      _delta = 0 - (e.detail / 3);
-    }
-    if (BROWSER_TYPE.opera || BROWSER_TYPE.safari) {
-      _delta = 0 - _delta;
+    var
+    _this = EVENT,
+    _timeNow = new Date().getTime();
+    _this._modifiers(e);
+    // Prevent non-repeat behaviour by waiting at least 100ms before repeating
+    if(_this._lastKeyPressTime > (_timeNow-100)){
+      return;
     }
-    for (; i !== _this.focused.length; i++) {
-      if (_this.focused[i] === true) {
-        if (_this.focusOptions[i].mouseWheel === true) {
-          Event.stop(e);
-          _this.focusOptions[i].ctrl.mouseWheel(_delta);
+    if(_this._lastKeyDown !== null){
+      var
+      _keyCode = _this.translateKeyCodes(_this._lastKeyDown),
+      _keyDownStateForActiveControl = _this.activeControl?(_this.focusOptions[_this.activeControl.elemId]?_this.focusOptions[_this.activeControl.elemId].keyDown:false):false,
+      _repeat = (_keyDownStateForActiveControl === 'repeat'),
+      _stopEvent = false;
+      if (_this.activeControl && _keyDownStateForActiveControl && _repeat) {
+        if(_this.activeControl.keyDown(_keyCode)){
+          _stopEvent = true;
         }
       }
+      if(_stopEvent){
+        Event.stop(e);
+      }
     }
   },
   
-  /* Alternative right button detection, wrapper for the mouseDown method */
-  contextMenu: function(e) {
-    // EVENT.mouseDown(e, false);
-    Event.stop(e);
+  
+  // Normalization map of keyCodes for Opera specifically
+  _operaKeyCodeTranslations: {
     
-    /***
+    // Symbol keys:
+    59: 186, // [;:]
+    61: 187, // [=+]
+    44: 188, // [,<]
+    45: 189, // [-_]
+    46: 190, // [.>]
+    47: 191, // [/?]
+    96: 192, // [`~]
+    91: 219, // [[{]
+    92: 220, // [\|]
+    93: 221, // []}]
+    39: 222, // ['"]
     
-    IMPLEMENT SEPARATE CONTEXT-MENU EVENT HANDLING HERE
+    // Numeric keypad keys can't be mapped on Opera, because Opera 
+    // doesn't differentiate between the keys on the numeric keypad
+    // versus the functionally same keys elsewhere on the keyboard.
     
-    ***/
+    // Branded keys:
+    // Apple Command keys are same as ctrl, but ctrl is 0; Can't be re-mapped reliably.
+    // The Windows Menu key also return 0, so it can't be re-mapped either.
+    219: 91, // Left Windows key (Start)
+    220: 92  // Right Windows key (Start)
+  },
+  
+  // Normalization map of keyCodes for Gecko (Mozilla) browsers specifically
+  _mozillaKeyCodeTranslations: {
     
-    // if(Event.isLeftClick(e)){
-    //   EVENT.status[EVENT.button2] = false;
+    // Symbol keys:
+    59: 186, // [;:]
+    61: 187, // [=+]
+    109: 189, // [-_]
+    
+    // Branded keys:
+    224: 91 // Apple Command key to left windows key mapping
+    
+  },
+  
+/** Translates keyCodes to the normalized pseudo-ascii used by IE and WebKit browsers.
+  * Opera and Mozilla browsers use different codes, so they'll need translations.
+  **/
+  translateKeyCodes: function(_keyCode){
+    var
+    _this = EVENT,
+    _transCode;
+    
+    // We use the WebKit and IE browsers as the normalization base, because
+    // there is no variance between in these. Returns the keyCode as-is for
+    // browsers in this category.
+    if(BROWSER_TYPE.safari || BROWSER_TYPE.ie){
+      return _keyCode;
+    }
+    // Opera has its own keyCodes, which are different from all others.
+    else if(BROWSER_TYPE.opera){
+      _transCode = _this._operaKeyCodeTranslations[_keyCode];
+    }
+    // The assumption is that the other browsers do what mozille does.
+    else {
+      _transCode = _this._mozillaKeyCodeTranslations[_keyCode];
+    }
+    if(_transCode === undefined || _transCode === null){
+      return _keyCode;
+    }
+    // else {
+    //   console.log('key map from:',_keyCode,' to:',_transCode);
     // }
+    return _transCode;
   },
   
   _cmdKeys: [
-    224, // Mozilla Left or Right Command Key
-    219, // Opera Left Windows Key
-    220, // Opera Right Windows Key
-    0,   // Opera Menu Key or Linux Gecko: any Windows Key
-    17,  // Opera
+    17,  // Ctrl
     91,  // Others (Left Start Key or Left Command Key)
     92,  // Others (Right Start Key)
     93   // Others (Menu Key or Right Command Key)
   ],
   _detectCmdKey: function( _keyCode ) {
-    return (EVENT._cmdKeys.indexOf(_keyCode) !== -1);
+    
+    // On Opera, return true on any of the keycodes
+    if(BROWSER_TYPE.opera){
+      return (EVENT._cmdKeys.indexOf(_keyCode) !== -1);
+    }
+    // Any mac browser (except opera, above) uses left or right windows key
+    // equivalent as the Command key.
+    else if(BROWSER_TYPE.mac){
+      return ((_keyCode === 91) || (_keyCode === 93));
+    }
+    // Other platforms use CTRL as the command key.
+    else {
+      return (_keyCode === 17);
+    }
   },
   
   /* Handle the event modifiers. */

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rsence
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 1
-  - 5
-  version: 2.1.5
+  - 6
+  version: 2.1.6
 platform: ruby
 authors: 
 - Riassence Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-14 00:00:00 +02:00
+date: 2010-12-16 00:00:00 +02:00
 default_executable: rsence
 dependencies: 
 - !ruby/object:Gem::Dependency