rsence-pre 2.3.0.1 → 2.3.0.2

data/js/foundation/eventmanager/eventmanager.coffee

@@ -122,14 +122,14 @@ EventManagerApp = HApplication.extend
     4: []
     keysDown: []
     hasKeyDown: (k)->
-      @keysDown.indexOf(k) != -1
+      !!~@keysDown.indexOf(k)
     addKeyDown: (k)->
       if !@hasKeyDown(k)
         @keysDown.push( k )
         @[4] = @keysDown
     delKeyDown: (k)->
       i = @keysDown.indexOf(k)
-      if i != -1
+      if ~i
         @keysDown.splice( i, 1 )
         @[4] = @keysDown
     resetKeysDown: ->
@@ -199,8 +199,8 @@ EventManagerApp = HApplication.extend
   #
   # List of used event methods for global purposes:
   _eventMethods: [
-    'mouseMove', 'mouseUp', 'mouseDown', 'click', 'keyUp', 'keyDown',
-    'contextMenu', 'resize', 'mouseWheel', 'doubleClick'
+    'resize', 'mouseMove', 'doubleClick', 'contextMenu', 'click', 'mouseUp',
+    'mouseDown', 'keyUp', 'keyDown', 'mouseWheel'
   ]
   #
   # This structure keeps track of registered elem/event/object/method; see #observe and #stopObserving
@@ -220,7 +220,7 @@ EventManagerApp = HApplication.extend
       }
     _cache = @_observerMethods[_eventName]
     _elemIdx = _cache.elems.indexOf( _elem )
-    if _elemIdx != -1
+    if ~_elemIdx
       _prevFn = _cache.fns[_elemIdx]
       _prevCapture = _cache.capture[_elemIdx]
       Event.stopObserving( _elem, _eventName, _prevFn, _prevCapture )
@@ -241,7 +241,7 @@ EventManagerApp = HApplication.extend
       return false
     _cache = @_observerMethods[_eventName]
     _elemIdx = _cache.elems.indexOf(_elem)
-    return false if _elemIdx == -1
+    return false unless ~_elemIdx
     _prevFn = _cache.fns[_elemIdx]
     _prevCapture = _cache.capture[_elemIdx]
     Event.stopObserving( _elem, _eventName, _prevFn, _prevCapture )
@@ -402,19 +402,18 @@ EventManagerApp = HApplication.extend
         _value = _eventOptions[_key]
         if _value
           _eventsOn.push( _key )
-          @_listeners.byEvent[_key].unshift( _viewId ) if @_listeners.byEvent[_key].indexOf(_viewId) == -1
-          if _key == 'rectHover' and _value == 'intersects' and @_listeners._rectHoverIntersectMode.indexOf( _viewId ) == -1
+          @_listeners.byEvent[_key].unshift( _viewId ) unless ~@_listeners.byEvent[_key].indexOf(_viewId)
+          if _key == 'rectHover' and _value == 'intersects' and not ~@_listeners._rectHoverIntersectMode.indexOf( _viewId )
             @_listeners._rectHoverIntersectMode.unshift( _viewId )
         else
           _idx = @_listeners.byEvent[_key].indexOf(_viewId)
-          if _idx != -1
-            @_listeners.byEvent[_key].splice( _idx, 1 )
+          @_listeners.byEvent[_key].splice( _idx, 1 ) if ~_idx
       else
         @warn( "EventManager##{_warnMethodName} => Invalid event type: #{_key}" )
     _this = @
     @_listeners.byId[_viewId] = _eventsOn
     if _ctrl.enabled
-      @_listeners.enabled.unshift( _viewId ) if @_listeners.enabled.indexOf(_viewId) == -1
+      @_listeners.enabled.unshift( _viewId ) unless ~@_listeners.enabled.indexOf(_viewId)
       _elem = ELEM.get( _ctrl.elemId )
       @observe( _elem, 'mouseover', '_mouseOver' )
   #
@@ -426,20 +425,18 @@ EventManagerApp = HApplication.extend
       delete @_listeners.byId[_viewId]
     else
       @warn( "EventManager##{_warnMethodName} => viewId not registered: #{_viewId}" )
-      console.log(@_listeners.byId[_viewId],_viewId,_ctrl)
     for _key, _value of @_listeners.byEvent
       _viewIdx = _value.indexOf(_viewId)
-      if _viewIdx != -1
-        _value.splice(_viewIdx,1)
+      _value.splice(_viewIdx,1) if ~_viewIdx
       if _key == 'rectHover'
         _intersectHoverIdx = @_listeners._rectHoverIntersectMode.indexOf( _viewId )
-        if _intersectHoverIdx != -1
+        if ~_intersectHoverIdx
           @_listeners._rectHoverIntersectMode.splice( _intersectHoverIdx, 1 )
     _wasFocused = false
     _elem = ELEM.get( _ctrl.elemId )
     for _statusItem in [ 'dragged', 'selected', 'hovered', 'active', 'focused', 'enabled' ]
       _viewIdx = @_listeners[_statusItem].indexOf(_viewId)
-      if _viewIdx != -1
+      if ~_viewIdx
         if _statusItem == 'dragged'
           _ctrl.endDrag( @status.crsrX, @status.crsrY )
         else if _statusItem == 'selected'
@@ -552,7 +549,7 @@ EventManagerApp = HApplication.extend
   # mouseover event.
   focus: (_ctrl)->
     _viewId = _ctrl.viewId
-    if @_listeners.focused.indexOf(_viewId) == -1
+    unless ~@_listeners.focused.indexOf(_viewId)
       _elem = ELEM.get( _ctrl.elemId )
       @observe( _elem, 'mouseout', '_mouseOut' )
       @stopObserving( _elem, 'mouseover', '_mouseOver' )
@@ -567,7 +564,7 @@ EventManagerApp = HApplication.extend
   blur: (_ctrl)->
     _viewId = _ctrl.viewId
     _viewIdx = @_listeners.focused.indexOf(_viewId)
-    if _viewIdx != -1
+    if ~_viewIdx
       _elem = ELEM.get( _ctrl.elemId )
       @observe( _elem, 'mouseover', '_mouseOver' )
       @stopObserving( _elem, 'mouseout', '_mouseOut' )
@@ -621,8 +618,8 @@ EventManagerApp = HApplication.extend
   # #hover( _dragObj ) and #endHover( _dragObj ) calls
   _delegateHover: (_ctrl, x, y)->
     _byEvent = @_listeners.byEvent
-    _findPoint     = _byEvent.rectHover.indexOf( _ctrl.viewId ) == -1
-    _findTopmost   = _byEvent.multiDrop.indexOf( _ctrl.viewId ) == -1
+    _findPoint     = not ~_byEvent.rectHover.indexOf( _ctrl.viewId )
+    _findTopmost   = not ~_byEvent.multiDrop.indexOf( _ctrl.viewId )
     _findIntersect = true
     if _findPoint
       _area = HPoint.new( x, y )
@@ -630,7 +627,7 @@ EventManagerApp = HApplication.extend
     else
       _rect = _ctrl.rect
       _area = HRect.new( x, y, _rect.width, _rect.height )
-      if @_listeners._rectHoverIntersectMode.indexOf( _viewId ) == -1
+      if not ~@_listeners._rectHoverIntersectMode.indexOf( _viewId )
         _matchMethod = 'intersects'
       else
         _matchMethod = 'contains'
@@ -640,11 +637,11 @@ EventManagerApp = HApplication.extend
       _hoverItems = @_findAllDroppable(_area,_matchMethod,_ctrl.viewid)
     _endHover = []
     for _hoverId in @_listeners.hovered
-      if _hoverItems.indexOf( _hoverId ) == -1
+      unless ~_hoverItems.indexOf( _hoverId )
         _endHover.push( _hoverId )
     _startHover = []
     for _hoverId in _hoverItems
-      if @_listeners.hovered.indexOf( _hoverId ) == -1
+      unless ~@_listeners.hovered.indexOf( _hoverId )
         _startHover.push( _hoverId )
     for _viewId in _startHover
       @_views[_viewId].startHover(_ctrl)
@@ -662,8 +659,15 @@ EventManagerApp = HApplication.extend
       for _viewId in _parentIds
         continue if _viewId == _selfId
         _view = _views[_viewId]
-        if _view.hasAncestor? and _view.hasAncestor( HView ) and _view.rect[_matchMethod](_area)
-          if _droppable.indexOf( _viewId ) != -1
+        if _view.parent.hasAncestor( HView )
+          if _area.offsetTo?
+            _searchArea = HRect.nu(_area).offsetTo( _area.left-_view.parent.pageX(), _area.top-_view.parent.pageY() )
+          else
+            _searchArea = HPoint.nu( _area.x-_view.parent.pageX(), _area.y-_view.parent.pageY() )
+        else
+          _searchArea = _area
+        if _view.hasAncestor? and _view.hasAncestor( HView ) and _view.rect[_matchMethod](_searchArea)
+          if ~_droppable.indexOf( _viewId )
             _dropId = _search( _view.viewsZOrder.slice().reverse() )
             return _dropId if _dropId
             return _viewId
@@ -684,7 +688,7 @@ EventManagerApp = HApplication.extend
         continue if _viewId == _selfId
         _view = _views[_viewId]
         if _view.hasAncestor? and _view.hasAncestor( HView ) and _view.rect[_matchMethod](_area)
-          _found.push( _viewId ) if _droppable.indexOf( _viewId ) != -1
+          _found.push( _viewId ) if ~_droppable.indexOf( _viewId )
           _search( _view.viewsZOrder.slice().reverse() )
     _search( HSystem.viewsZOrder.slice().reverse() )
     return _found
@@ -693,19 +697,36 @@ EventManagerApp = HApplication.extend
   delActiveControl: (_newActive)->
     _active = @_listeners.active
     _focused = @_listeners.focused
+    _dragged = @_listeners.dragged
+    _hovered = @_listeners.hovered
     return null if _active.length == 0
-    if _active.length == 1
-      _prevActive = @_views[_active[0]]
-    else
+    _prevActive = @_views[_active[0]]
+    if _active.length != 1
       @warn "Danger, too many active items: #{JSON.stringify(_active)}"
     for _viewId in _active.slice()
       continue if _newActive != null and _viewId == _newActive.viewId
       _ctrl = @_views[_viewId]
       _ctrl.active = false
       _idx = _active.indexOf( _viewId )
+      _dragIdx = _dragged.indexOf(_viewId)
+      # console.log('dragIdx:',~_dragIdx)
+      if ~_dragIdx
+        _dragged.splice( _dragIdx, 1 )
+        for _dropViewId in _hovered
+          _dropCtrl = @_views[_dropViewId]
+          _dropCtrl.endHover(_ctrl) if _dropCtrl.endHover?
+          _dropCtrl.drop(_ctrl) if _dropCtrl.drop?
+        [ x, y ] = @status.crsr
+        _ctrl.endDrag( x, y )
       _active.splice( _idx, 1 )
-      @blur(_ctrl) if _focused.indexOf(_viewId) != -1
+      # console.log('lost:',_viewId)
+      @blur(_ctrl) if ~_focused.indexOf(_viewId)
       _ctrl.lostActiveStatus(_newActive)
+      # _ctrl.setStyle('border','1px dotted red')
+      # if @prevActiveCtrl
+      #   @prevActiveCtrl.setStyle('border','1px dotted gray')
+      #   @prevActiveCtrl = null
+      # @prevActiveCtrl = _ctrl
     _prevActive
   #
   # Adds the active control
@@ -713,11 +734,13 @@ EventManagerApp = HApplication.extend
     _active = @_listeners.active
     _focused = @_listeners.focused
     _idx = _active.indexOf( _ctrl.viewId )
-    if _idx == -1
+    unless ~_idx
       _active.unshift(_ctrl.viewId)
-      @focus(_ctrl) if _focused.indexOf(_ctrl.viewId) == -1
+      # console.log('gained:',_ctrl.viewId)
+      @focus(_ctrl) unless ~_focused.indexOf(_ctrl.viewId)
       _ctrl.active = true
       _ctrl.gainedActiveStatus(_prevActive)
+      # _ctrl.setStyle('border','1px dotted blue')
   #
   # Sets the active control
   changeActiveControl: (_ctrl)->
@@ -730,7 +753,7 @@ EventManagerApp = HApplication.extend
     _viewId = _ctrl.viewId
     @focus( _viewId )
     @changeActiveControl(_ctrl)
-    @_listeners.dragged.unshift( _viewId ) if @_listeners.dragged.indexOf( _viewId ) == -1
+    @_listeners.dragged.unshift( _viewId ) unless ~@_listeners.dragged.indexOf( _viewId )
     _ctrl.startDrag( @status.crsrX, @status.crsrY, @status.button2 )
   #
   # Cancels text selections, which happen by 
@@ -759,25 +782,25 @@ EventManagerApp = HApplication.extend
     _startDragIds = []
     _stop = false
     for _viewId in _focused
-      _newActive.push( _viewId ) if _active.indexOf(_viewId) == -1
+      _newActive.push( _viewId ) unless ~_active.indexOf(_viewId)
       _eventOptions = @_listeners.byId[_viewId]
-      if _mouseDownable.indexOf( _viewId ) != -1
+      if ~_mouseDownable.indexOf( _viewId )
         _mouseDownIds.push( _viewId )
-      if _draggable.indexOf( _viewId ) != -1 and _dragged.indexOf( _viewId ) == -1
+      if ~_draggable.indexOf( _viewId ) and not ~_dragged.indexOf( _viewId )
         _startDragIds.push( _viewId )
     for _viewId in _newActive
       _ctrl = @_views[_viewId]
       @changeActiveControl( _ctrl )
     [ x, y ] = @status.crsr
+    @_handleMouseMove(x,y)
     for _viewId in _mouseDownIds
       _ctrl = @_views[_viewId]
       _stop = true if _ctrl.mouseDown( x, y, _leftClick )
     for _viewId in _startDragIds
-      if _dragged.indexOf( _viewId ) == -1
+      unless ~_dragged.indexOf( _viewId )
         _ctrl = @_views[_viewId]
         _dragged.unshift( _viewId )
         _stop = true if _ctrl.startDrag( x, y, _leftClick )
-    @_handleMouseMove(x,y)
     @_cancelTextSelection() unless _startDragIds.length == 0 and _mouseDownIds.length == 0
     Event.stop(e) if _stop
   #
@@ -804,22 +827,20 @@ EventManagerApp = HApplication.extend
     _endDragIds = []
     _stop = false
     for _viewId in _focused
-      _newActive.push( _viewId ) if _active.indexOf(_viewId) == -1
+      _newActive.push( _viewId ) unless ~_active.indexOf(_viewId)
       _eventOptions = @_listeners.byId[_viewId]
-      if _mouseUppable.indexOf( _viewId ) != -1
+      if ~_mouseUppable.indexOf( _viewId )
         _mouseUpIds.push( _viewId )
-      if _draggable.indexOf( _viewId ) != -1 and _dragged.indexOf( _viewId ) != -1
+      if ~_draggable.indexOf( _viewId ) and ~_dragged.indexOf( _viewId )
         _endDragIds.push( _viewId )
-    for _viewId in _newActive
-      _ctrl = @_views[_viewId]
-      @changeActiveControl( _ctrl )
     [ x, y ] = @status.crsr
+    @_handleMouseMove(x,y)
     for _viewId in _mouseUpIds
       _ctrl = @_views[_viewId]
       _stop = true if _ctrl.mouseUp( x, y, _leftClick )
     for _viewId in _endDragIds
       _dragIdx = _dragged.indexOf( _viewId )
-      unless _dragIdx == -1
+      if ~_dragIdx
         _ctrl = @_views[_viewId]
         _dragged.splice( _dragIdx, 1 )
         for _dropViewId in _hovered
@@ -827,9 +848,11 @@ EventManagerApp = HApplication.extend
           _dropCtrl.endHover(_ctrl) if _dropCtrl.endHover?
           _dropCtrl.drop(_ctrl) if _dropCtrl.drop?
         _stop = true if _ctrl.endDrag( x, y, _leftClick )
+    for _viewId in _newActive
+      _ctrl = @_views[_viewId]
+      @changeActiveControl( _ctrl )
     @_listeners.hovered = []
     @_listeners.dragged = []
-    @_handleMouseMove(x,y)
     @_cancelTextSelection() unless _endDragIds.length == 0 and _mouseUpIds.length == 0
     Event.stop(e) if _stop
     ## /jatka
@@ -849,28 +872,47 @@ EventManagerApp = HApplication.extend
     _focused = @_listeners.focused
     _active  = @_listeners.active
     _clickable = @_listeners.byEvent.click
+    _doubleClickable = @_listeners.byEvent.doubleClick
+    _doubleClickWait = []
     _newActive = []
     _clickIds = []
     _stop = false
     for _viewId in _focused
-      _newActive.push( _viewId ) if _active.indexOf(_viewId) == -1
-      if _clickable.indexOf(_viewId) != -1
+      _newActive.push( _viewId ) unless ~_active.indexOf(_viewId)
+      if ~_clickable.indexOf(_viewId) and ~_doubleClickable.indexOf(_viewId)
+        _doubleClickWait.push( _viewId )
+      else if ~_clickable.indexOf(_viewId)
         _clickIds.push( _viewId )
     for _viewId in _newActive
       _ctrl = @_views[_viewId]
       @changeActiveControl( _ctrl )
     [ x, y ] = @status.crsr
+    @_handleMouseMove(x,y)
     for _viewId in _clickIds
       _ctrl = @_views[_viewId]
       unless _ctrl.click? and typeof _ctrl.click == 'function'
         @warn( 'no click:', _ctrl, _ctrl.click?, typeof _ctrl.click )
         continue
       _stop = true if _ctrl.click( x, y, _leftClick )
-    @_handleMouseMove(x,y)
+    if _doubleClickWait.length
+      _this = @
+      @dblClickWait = setTimeout( (->
+          for _viewId in _doubleClickWait
+            _ctrl = _this._views[_viewId]
+            unless _ctrl.click? and typeof _ctrl.click == 'function'
+              _this.warn( 'no click:', _ctrl, _ctrl.click?, typeof _ctrl.click )
+              continue
+            _stop = true if _ctrl.click( x, y, _leftClick )
+          Event.stop(e) if _stop
+        ), 50
+      )
     Event.stop(e) if _stop
   #
   # Handles doubleClick events
   doubleClick: (e)->
+    if @dblClickWait
+      clearTimeout( @dblClickWait )
+      delete this['dblClickWait']
     @_modifiers(e)
     _leftClick = Event.isLeftClick(e)
     @status.setButton1( false )
@@ -881,12 +923,14 @@ EventManagerApp = HApplication.extend
     _doubleClicks = []
     _doubleClickable = @_listeners.byEvent.doubleClick
     _stop = false
+    # console.log('focused:',_focused)
     for _viewId in _focused
-      if _doubleClickable.indexOf(_viewId) != -1
+      if ~_doubleClickable.indexOf(_viewId)
         _doubleClicks.push( _viewId )
-    for _viewId in _doubleClickable
+    for _viewId in _doubleClicks
       _ctrl = @_views[_viewId]
       if _ctrl.doubleClick?
+        # console.log _ctrl.componentName
         _stop = true if _ctrl.doubleClick(x,y,true)
     Event.stop(e) if _stop
   #
@@ -905,7 +949,7 @@ EventManagerApp = HApplication.extend
     _mouseWheelable = @_listeners.byEvent.mouseWheel
     _stop = false
     for _viewId in _focused
-      if _mouseWheelable.indexOf(_viewId) != -1
+      if ~_mouseWheelable.indexOf(_viewId)
         _mouseWheels.push( _viewId )
     for _viewId in _mouseWheels
       _ctrl = @_views[_viewId]
@@ -922,7 +966,7 @@ EventManagerApp = HApplication.extend
     _focused = @_listeners.focused
     _contextMenuable = @_listeners.byEvent.contextMenu
     for _viewId in _focused
-      if _contextMenuable.indexOf(_viewId) != -1
+      if ~_contextMenuable.indexOf(_viewId)
         _ctrl = @_views[_viewId]
         _stop = false if _ctrl.contextMenu? and _ctrl.contextMenu()
     Event.stop(e) if _stop
@@ -990,7 +1034,7 @@ EventManagerApp = HApplication.extend
   _detectCmdKey: ( _keyCode )->
     # On Opera, return true on any of the keycodes
     if BROWSER_TYPE.opera
-      return @_cmdKeys.indexOf(_keyCode) != -1
+      return !!~@_cmdKeys.indexOf(_keyCode)
     # Any mac browser (except opera, above) uses left or right windows key
     # equivalent as the Command key.
     else if BROWSER_TYPE.mac
@@ -1011,7 +1055,7 @@ EventManagerApp = HApplication.extend
     _keyDowns = []
     unless @status.hasKeyDown( _keyCode ) and @_lastKeyDown != _keyCode
       for _viewId in _active
-        _keyDowns.push( _viewId ) if _keyDowners.indexOf( _viewId ) != -1
+        _keyDowns.push( _viewId ) if ~_keyDowners.indexOf( _viewId )
       @status.addKeyDown( _keyCode )
     # repeat not implemented yet
     for _viewId in _keyDowns
@@ -1033,20 +1077,20 @@ EventManagerApp = HApplication.extend
     _keyUps = []
     _textEnterers = @_listeners.byEvent.textEnter
     _textEnters = []
+    for _viewId in _textEnterers
+      _textEnters.push( _viewId ) if ~_enabled.indexOf( _viewId )
+    for _viewId in _textEnters
+      _ctrl = @_views[_viewId]
+      if _ctrl.textEnter?
+        _stop = true if _ctrl.textEnter( _keyCode )
     if @status.hasKeyDown( _keyCode )
       for _viewId in _active
-        _keyUps.push( _viewId ) if _keyUppers.indexOf( _viewId ) != -1
+        _keyUps.push( _viewId ) if ~_keyUppers.indexOf( _viewId )
       @status.delKeyDown( _keyCode )
     for _viewId in _keyUppers
       _ctrl = @_views[_viewId]
       if _ctrl.keyUp?
         _stop = true if _ctrl.keyUp( _keyCode )
-    for _viewId in _textEnterers
-      _textEnters.push( _viewId ) if _enabled.indexOf( _viewId ) != -1
-    for _viewId in _textEnters
-      _ctrl = @_views[_viewId]
-      if _ctrl.textEnter?
-        _stop = true if _ctrl.textEnter( _keyCode )
     Event.stop(e) if _stop
   keyPress: (e)->
     @warn('EventManager#keyPress not implemented')

data/js/foundation/geom/rect/rect.js

@@ -663,7 +663,7 @@ HRect = HClass.extend({
   *
   **/
   bind: function(_view){
-    if(this.viewIds.indexOf( _view.viewId ) === -1){
+    if(!~this.viewIds.indexOf( _view.viewId )){
       this.viewIds.push( _view.viewId );
     }
     this._updateFlexibleDimensions();
@@ -674,7 +674,7 @@ HRect = HClass.extend({
   **/
   release: function(_view){
     var _viewIdx = this.viewIds.indexOf(_view.viewId);
-    if(_viewIdx !== -1){
+    if(~_viewIdx){
       this.viewIds.splice( _viewIdx, 1 );
     }
   },

data/js/foundation/json_renderer/json_renderer.js

@@ -114,7 +114,7 @@ COMM.JSONRenderer = HClass.extend({
       _extend = HClass;
     }
     for( _key in _definition ){
-      if( _reserved.indexOf( _key ) === -1 ){
+      if( !~_reserved.indexOf( _key ) ){
         _value = _definition[_key];
         if( typeof _value === 'string' ){
           _value = this.extEval( _value );
@@ -134,7 +134,7 @@ COMM.JSONRenderer = HClass.extend({
     if(_className === undefined){
       return false;
     }
-    if(_className.indexOf('.') !== -1){
+    if(~_className.indexOf('.')){
       var
       _splitClass = _className.split('.'),
       j = 1,
@@ -219,7 +219,7 @@ COMM.JSONRenderer = HClass.extend({
     if( !_dataNode['class'] ){
 
       for( i in _dataNode ){
-        if( _reserved.indexOf( i ) === -1 ){
+        if( !~_reserved.indexOf( i ) ){
           _className = i;
           _origNode = _dataNode;
           _dataNode = _dataNode[i];

data/js/foundation/system/system.js

@@ -317,11 +317,11 @@ HSystem = {
   
 /** Updates the z-indexes of the children of the given +_viewId+. **/
   updateZIndexOfChildren: function(_viewId) {
-    if(this._updateZIndexOfChildrenBuffer.indexOf(_viewId)===-1){
+    if(!~this._updateZIndexOfChildrenBuffer.indexOf(_viewId)){
       this._updateZIndexOfChildrenBuffer.push(_viewId);
     }
     if((_viewId !== undefined && _viewId !== null) && (this.views[_viewId].app === this.views[_viewId].parent)){
-      (this._updateZIndexOfChildrenBuffer.indexOf(null)===-1) && this._updateZIndexOfChildrenBuffer.push(null);
+      (!~this._updateZIndexOfChildrenBuffer.indexOf(null)) && this._updateZIndexOfChildrenBuffer.push(null);
     }
   },
   

data/js/foundation/thememanager/thememanager.js

@@ -138,7 +138,7 @@ HThemeManager = HClass.extend({
   **/
   getCssFilePath: function( _fileName ){
     var _themeName      = this._cssEvalParams[0];
-    if((HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)!==-1) && (BROWSER_TYPE.ie6 || BROWSER_TYPE.symbian) ){
+    if((~HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)) && (BROWSER_TYPE.ie6 || BROWSER_TYPE.symbian) ){
       return "url('"+this._joinPath( this.getThemeGfxPath(), _fileName.replace('.png','-ie6.gif') )+"')";
     }
     else {
@@ -314,14 +314,14 @@ HThemeManager = HClass.extend({
     /* Load Theme-Specific CSS: */
     if(!this._cssCache[_themeName]){
       this._cssCache[_themeName] = {};
-      if(HNoCommonCSS.indexOf(_themeName)===-1){
+      if(!~HNoCommonCSS.indexOf(_themeName)){
         var _commonCssUrl = this._cssUrl( _themeName, 'common', _themePath, null );
         this.loadCSS( _commonCssUrl );
       }
     }
     
     /* Load Component-Specific CSS, unless configured to only load the common css: */
-    if(HNoComponentCSS.indexOf(_themeName)===-1){
+    if(!~HNoComponentCSS.indexOf(_themeName)){
       if (!this._cssCache[_themeName][_componentName]){
         var _componentCssUrl = this._cssUrl( _themeName, _componentName, _themePath );
         this._cssCache[_themeName][_componentName] = true;
@@ -340,7 +340,7 @@ HThemeManager = HClass.extend({
     return _url;
   },
   _componentGfxFile: function( _themeName, _componentName, _themePath, _fileName ){
-    if((HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)!==-1) && BROWSER_TYPE.ie6){
+    if((~HThemeHasIE6GifsInsteadOfPng.indexOf(_themeName)) && BROWSER_TYPE.ie6){
       return this._joinPath( this._componentGfxPath(_themeName, _componentName, _themePath), _fileName.replace('.png','-ie6.gif') );
     }
     return this._joinPath( this._componentGfxPath(_themeName, _componentName, _themePath), _fileName );

data/js/foundation/value/value.js

@@ -133,7 +133,7 @@ HValue = HClass.extend({
     if(_responder===undefined){
       throw("HValueBindError: responder is undefined!");
     }
-    if(this.views.indexOf(_responder)===-1){
+    if(!~this.views.indexOf(_responder)){
       this.views.push(_responder);
       _responder.setValueObj( this );
     }

data/js/foundation/view/view.js

@@ -783,7 +783,7 @@ HView = HClass.extend({
       var _partName = this.markupElemNames[ i ],
           _elemName = _partName + this.elemId,
           _htmlIdMatch = ' id="' + _elemName + '"';
-      if( this.markup.indexOf( _htmlIdMatch ) !== -1 ) {
+      if( ~this.markup.indexOf( _htmlIdMatch ) ) {
         this.markupElemIds[ _partName ] = this.bindDomElement( _elemName );
       }
     }
@@ -1432,7 +1432,7 @@ HView = HClass.extend({
       HSystem.delView(this.viewId);
       this.parent.viewsZOrder.splice( _viewZIdx, 1 );
       var _sysUpdateZIndexOfChildrenBufferIndex = HSystem._updateZIndexOfChildrenBuffer.indexOf( this.viewId );
-      if(_sysUpdateZIndexOfChildrenBufferIndex !== -1){
+      if(~_sysUpdateZIndexOfChildrenBufferIndex){
         HSystem._updateZIndexOfChildrenBuffer.splice( _sysUpdateZIndexOfChildrenBufferIndex, 1 );
       }
       
@@ -2005,7 +2005,7 @@ HView = HClass.extend({
   **/
   unbindDomElement: function(_elementId) {
     var _indexOfElementId = this._domElementBindings.indexOf(_elementId);
-    if (_indexOfElementId > -1) {
+    if (~_indexOfElementId) {
       ELEM.del(_elementId);
       this._domElementBindings.splice(_indexOfElementId, 1);
     }
@@ -2083,7 +2083,7 @@ HView = HClass.extend({
       return false;
     }
     if( typeof _obj['hasAncestor'] === 'function' ){
-      if( _obj.parents.indexOf( this ) !== -1 ){
+      if( ~_obj.parents.indexOf( this ) ){
         return true;
       }
     }

data/js/lists/checkboxlist/checkboxlist.js

@@ -60,7 +60,7 @@ HCheckboxList = HListItemControl.extend({
   *
   **/
   addItem: function( _listValue ){
-    if(this.value.indexOf(_listValue) === -1){
+    if(!~this.value.indexOf(_listValue)){
       var _newValue = [], i = 0;
       for( ; i < this.value.length; i++ ){
         _newValue.push( this.value[i] );
@@ -80,7 +80,7 @@ HCheckboxList = HListItemControl.extend({
   **/
   delItem: function( _listValue ){
     var _listIndex = this.value.indexOf(_listValue);
-    if(_listIndex !== -1){
+    if(~_listIndex){
       var _newValue = [], i = 0;
       for( ; i < this.value.length; i++ ){
         if(this.value[i] !== _listValue){
@@ -125,7 +125,7 @@ HCheckboxList = HListItemControl.extend({
       _listItem = _listItems[i];
       _value = _listItem[0];
       _label = _listItem[1];
-      _checked = (this.value.indexOf( _value ) !== -1);
+      _checked = !!~this.value.indexOf( _value );
       _checkbox = this.ListCheckbox.nu(
         [ 4, (i*23)+4, null, 23, 4, null ],
         this, {
@@ -180,7 +180,7 @@ HCheckboxList = HListItemControl.extend({
         _isSelected;
     for( ; i < _listItems.length; i++ ){
       _listItemValue = _listItems[i][0];
-      _isSelected = (_value.indexOf( _listItemValue ) !== -1);
+      _isSelected = !!~_value.indexOf( _listItemValue );
       this.listItemViews[i].setValue( _isSelected );
       if(_isSelected){
         _selectedItems.push( _listItemValue );

data/js/lists/listitems/listitems.js

@@ -106,7 +106,7 @@ HListItemControl = HControl.extend({
         _listItems.push( _row );
       }
       // strings and integers
-      else if ( ['s','n'].indexOf(_rowType) !== -1 ){
+      else if ( ~['s','n'].indexOf(_rowType) ){
         _label = _row.toString();
         _value = _row;
         _listItems.push( [_value, _label] );

data/js/lists/propertylist/propertylisteditor/propertylisteditor.js

@@ -68,7 +68,7 @@ HPropertyListEditor = HControl.extend({
   lostActiveStatus: function(newActive){
     this.base();
     if( newActive &&
-      ( (newActive === this) || (newActive.parents.indexOf(this) !== -1) )
+      ( (newActive === this) || ~newActive.parents.indexOf(this) )
     ){
       return;
     }
@@ -132,7 +132,7 @@ HPropertyListEditor = HControl.extend({
       },
       refreshValue: function(){
         if(this.drawn){
-          if(this.boldTypes.indexOf(this.parent.value.type)!==-1){
+          if(~this.boldTypes.indexOf(this.parent.value.type)){
             this.setStyle('font-weight','bold',true);
           }
           else{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 2.3.0.1
+  version: 2.3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-04 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps