rsence-pre 3.0.0.3 → 3.0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d5815813e6446789184142c879d2221cc257b32
-  data.tar.gz: 65c160a4a11eed947c52cd188a8cab225d45e43b
+  metadata.gz: 6df666ef3e2d735857512b63aa2fc04d1ada8850
+  data.tar.gz: fd3ad1a68cad0ba219855d2103cb9befc7a5850b
 SHA512:
-  metadata.gz: d2f9f5b6a7e55bb928b15aa757255ed6d0703e20607072101064b4ea1a0fb49df0c41920e32fd6c465e58f3f5eec7d09292e142d738af192e7d85bad1ee0ad0d
-  data.tar.gz: 379816290d414e03d88d65b996666ef0f277a7edd9c7104e5802311231378de474d7939efc1144217d082fb0d16cfcecff3392e87988fbd8f3a6294c3c41bb79
+  metadata.gz: cf4190abefe05afc159985db95ab32cfdc23c4a259c961ecf1041beb3b4354042f828d60678673d5d0469f19f1891a9ff7d41ad1a903e72632bf15bc341aadef
+  data.tar.gz: 91d70e5aeafe34cc3e9c9678e912241a689fc38c05527c6ff7125d0a1d85e75e72bfe36fa91587c5c7f95731df12e83ba210ad6ef3436df89d37983c665228ea

data/VERSION

@@ -1 +1 @@
-3.0.0.3.pre
+3.0.0.4.pre

data/client/js/controls/tab/tab.js

@@ -232,9 +232,11 @@ HTab = HControl.extend({
   *
   **/
   removeTab: function(_tabIdx){
-    var _selIdx = this.selectIdx,
-        _tabViewId = this.tabs[_tabIdx],
-        _tabLabelElemId = this.tabViews[_tabIdx];
+    var
+    _selIdx = this.selectIdx,
+    _tabViewId = this.tabs[_tabIdx],
+    _tabLabelElemId = this.tabLabels[_tabIdx],
+    _tabLabelWidth, i = 0;
     this.tabs.splice(_tabIdx,1);
     this.tabLabels.splice(_tabIdx,1);
     this.tabLabelBounds.splice(_tabIdx,1);
@@ -256,6 +258,21 @@ HTab = HControl.extend({
     }
     ELEM.del(_tabLabelElemId);
     HSystem.views[_tabViewId].die();
+    
+    //Reset labels positions
+    this.rightmostPx = 0;
+    for(; i < this.tabs.length; i++){
+      _tabLabelElemId = this.tabLabels[i];
+      _tabLabelWidth = ELEM.getIntStyle(_tabLabelElemId,'width');
+      ELEM.setStyle(_tabLabelElemId,this.tabLabelAlign,this.rightmostPx+'px');
+      this.rightmostPx += _tabLabelWidth;
+    }
+    if(this.tabLabelAlign === 'right'){
+      ELEM.setStyle(this.markupElemIds[this.tabLabelParentElem],'width',this.rightmostPx+'px');
+    }
+    else if (this.tabLabelFillBg) {
+      ELEM.setStyle(this.markupElemIds.state,'left',this.rightmostPx+'px');
+    }
   }
 });
 
@@ -315,7 +332,7 @@ GUITreeTabView = HControl.extend({
     if( _value.type === undefined || _value.version === undefined ){
       _value = {
         'type': 'GUITree',
-        'version': 0.9,
+        'version': 1.0,
         'class': 'HView',
         'rect': [0,0, null,null, 0,0],
         'options': { 'style': { 'overflow': 'auto' } },

data/client/js/controls/textarea/textarea.js

@@ -9,8 +9,8 @@
   ***/
 var//RSence.Controls
 HTextArea = HTextControl.extend({
-  
-  componentName: "textarea"
 
-  
+  componentName: "textarea",
+  defaultKey: function(){return true;} // bypass handler for return presses
+
 });

data/client/js/foundation/eventmanager/eventmanager.coffee

@@ -91,7 +91,7 @@ EventManagerApp = HApplication.extend
   #   metaKeyDown  =>  The state of the Meta key.
   #   cmdKeyDown   =>  The state of the Command key (or equivalent, like the Windows key).
   # Note: Will be deprecated in favor of an hash with keys instead of numeric indexes.
-  status: 
+  status:
     0: false
     button1: false
     setButton1: (f)->
@@ -293,7 +293,7 @@ EventManagerApp = HApplication.extend
     _methods.push( 'keyPress' ) unless BROWSER_TYPE.safari or BROWSER_TYPE.ie
     for _methodName in _methods
       if _methodName == 'doubleClick'
-        _eventName = 'dblclick' 
+        _eventName = 'dblclick'
       else
         _eventName = _methodName.toLowerCase()
       @observe( _targetElem, _eventName, _methodName )
@@ -359,7 +359,7 @@ EventManagerApp = HApplication.extend
               _idx = @_listeners.byEvent['keyRepeat'].indexOf(_viewId)
               @_listeners.byEvent['keyRepeat'].splice( _idx, 1 ) if ~_idx
           unless ~@_listeners.byEvent[_key].indexOf(_viewId)
-            @_listeners.byEvent[_key].unshift( _viewId ) 
+            @_listeners.byEvent[_key].unshift( _viewId )
           if _key == 'rectHover' and _value == 'intersects' and
              not ~@_listeners._rectHoverIntersectMode.indexOf( _viewId )
             @_listeners._rectHoverIntersectMode.unshift( _viewId )
@@ -552,9 +552,9 @@ EventManagerApp = HApplication.extend
         ELEM.setStyle( _elemId, 'left', x+'px' )
         ELEM.setStyle( _elemId, 'top', y+'px' )
       for _elemId in [ @_debugHighlightT, @_debugHighlightB ]
-        ELEM.setStyle( _elemId, 'width', w+'px' )        
+        ELEM.setStyle( _elemId, 'width', w+'px' )
       for _elemId in [ @_debugHighlightL, @_debugHighlightR ]
-        ELEM.setStyle( _elemId, 'height', h+'px' )        
+        ELEM.setStyle( _elemId, 'height', h+'px' )
       ELEM.setStyle( @_debugHighlightB, 'top', (y+h)+'px' )
       ELEM.setStyle( @_debugHighlightB, 'left', x+'px' )
       ELEM.setStyle( @_debugHighlightR, 'top', y+'px' )
@@ -779,7 +779,7 @@ EventManagerApp = HApplication.extend
     @_listeners.dragged.unshift( _viewId ) unless ~@_listeners.dragged.indexOf( _viewId )
     _ctrl.startDrag( @status.crsrX, @status.crsrY, @status.button2 )
   #
-  # Cancels text selections, which happen by 
+  # Cancels text selections, which happen by
   _cancelTextSelection: ->
     # Remove possible selections.
     ELEM.get(0).focus()
@@ -1010,11 +1010,11 @@ EventManagerApp = HApplication.extend
       92: 220 # [\|]
       93: 221 # []}]
       39: 222 # ['"]
-      
-      # Numeric keypad keys can't be mapped on Opera, because Opera 
+
+      # 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.
@@ -1025,7 +1025,7 @@ EventManagerApp = HApplication.extend
       59: 186  # [;:]
       61: 187  # [=+]
       109: 189 # [-_]
-      
+
       # Branded keys:
       224: 91 # Apple Command key to left windows key mapping
   #
@@ -1066,6 +1066,31 @@ EventManagerApp = HApplication.extend
     # Other platforms use CTRL as the command key.
     return _keyCode == 17
   #
+  # Special key method handlers for ESC and RETURN, maybe others in the future
+  _defaultKeyActions:
+    '13': 'defaultKey' # return
+    '27': 'escKey' # esc
+  #
+  # Traverses down the parent hierarchy searching for a parent object
+  # that responds true to _methodName. If _ctrl is undefined, use
+  # a special default rule of auto-selecting the active control and
+  # checking all of its siblings before traversing.
+  defaultKey: (_methodName,_ctrl)->
+    if _ctrl?
+      return true if _ctrl[_methodName]? and _ctrl[_methodName]()
+    else # first special rules, check same
+      return null unless @_listeners.active
+      _ctrl = @_views[@_listeners.active[0]]
+      return true if _ctrl[_methodName]? and _ctrl[_methodName]()
+      for _viewId in _ctrl.parent.views
+        continue if _ctrl.viewId == _viewId
+        _ctrl = @_views[_viewId]
+        if _ctrl[_methodName]?
+          return true if _ctrl[_methodName]()
+    if _ctrl.parent?
+      return true if @defaultKey(_methodName,_ctrl.parent)
+    return null
+  #
   # Handles the keyDown event
   keyDown: (e)->
     @_modifiers(e)
@@ -1088,6 +1113,13 @@ EventManagerApp = HApplication.extend
       _ctrl = @_views[_viewId]
       if _ctrl.keyDown?
         _stop = true if _ctrl.keyDown(_keyCode)
+    #
+    # Some keys are special (esc and return) and they have their own
+    # special events: defaultKey and escKey, which aren't limited
+    # to instances of HControl, but any parent object will work.
+    if not _repeating and @_defaultKeyActions[_keyCode.toString()]
+      _defaultKeyMethod = @_defaultKeyActions[_keyCode.toString()]
+      _stop = true if @defaultKey(_defaultKeyMethod)
     @_lastKeyDown = _keyCode
     Event.stop(e) if _stop
   keyUp: (e)->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 3.0.0.3
+  version: 3.0.0.4
 platform: ruby
 authors:
 - Riassence Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -263,7 +263,6 @@ files:
 - client/js/foundation/control/valuematrix/valuematrix.js
 - client/js/foundation/control/valueresponder/valueresponder.js
 - client/js/foundation/eventmanager/eventmanager.coffee
-- client/js/foundation/eventmanager/eventmanager.js
 - client/js/foundation/geom/point/point.js
 - client/js/foundation/geom/rect/rect.js
 - client/js/foundation/json_renderer/json_renderer.js