rsence-pre 2.3.0.16 → 2.3.0.17

data/VERSION

@@ -1 +1 @@
-2.3.0.16.pre
+2.3.0.17.pre

data/conf/default_conf.yaml

@@ -1,3 +1,4 @@
+---
   #### Server configuration
   #
   # The :base_url specifies the prefix for all default http responders.
@@ -27,7 +28,7 @@
     # A list of javascript dependencies to include in the html
     :deps: [ ]
     #
-    # Boot library:
+    # Boot library (default dependency, the package to load into html):
     :boot_lib: rsence
     #
     # Default additional libraries to use:
@@ -42,6 +43,57 @@
     # how many milliseconds to wait before doing an idle poll
     :server_poll_interval: 2000 # 2 seconds
   #
+  # Mobile browser default settings, by device group and model:
+  :mobile:
+    #
+    # iOS devices, defaults to iPads:
+    ios:
+      scale: 1.0
+      scale_min: 1.0
+      scale_max: 1.0
+      #
+      # Horizontal mode:
+      landscape:
+        # Fullscreen (app) mode
+        fullscreen:
+          width:  1024
+          height: 672
+        browser:
+          width:  1024
+          height: 600
+      #
+      # Horizontal mode:
+      portrait:
+        # Fullscreen (app) mode
+        fullscreen:
+          width:  768
+          height: 1024
+        browser:
+          width:  768
+          height: 928
+      #
+      # Dummy iPad override (same as default)
+      ipad:
+        # nothing to override
+      iphone:
+        scale: 0.5
+        scale_min: 0.5
+        scale_max: 0.5
+        landscape:
+          fullscreen:
+            width: 960
+            height: 600
+          browser:
+            width: 960
+            height: 536
+        portrait:
+          fullscreen:
+            width: 640
+            height: 920
+          browser:
+            width: 640
+            height: 856
+  #
   # The settings for the daemon
   :daemon:
     #
@@ -208,202 +260,3 @@
   :broker_urls: { }
 
 
-  #### Client package build configuration
-  #
-  #
-  :client_pkg:
-
-    # Source directories to scan
-    :src_dirs: []
-    
-    # List of theme names to include and pack
-    :theme_names:
-      - default  # Makes default_theme.js containing css and html templates
-      - bright   # Makes bright_theme.js containing css and html templates
-
-    # List of packages to build
-    :packages:
-
-      # The core package, loaded by default using a script tag in index_html
-      core:
-        
-        # RSence.*
-        - rsence_ns
-        
-        - locale_settings    # HLocaleSettings
-        
-        # RSence.Core
-        - class             # HClass
-        - elem              # ELEM
-        - event             # Event
-        
-        # RSence.Util
-        - sha               # SHA
-        
-        # RSence.Foundation
-        - system            # HSystem
-        - valueresponder    # HValueResponder
-        - application       # HApplication
-        
-        # COMM
-        - comm              # COMM
-        - queue             # COMM.Queue
-        - session           # COMM.Session
-        - transporter       # COMM.Transporter
-        - sessionwatcher    # COMM.SessionWatcher
-        - urlresponder      # COMM.URLResponder
-        - autosync          # ( automatic sync setup )
-        - values            # COMM.Values
-        - value             # HValue
-        - jsloader          # COMM.JSLoader
-        - json_renderer     # COMM.JSONRenderer
-        - valuematrix       # HValueMatrixInterface & HValueMatrix
-        - point             # HPoint
-        - rect              # HRect
-        - thememanager      # HThemeManager
-        - markupview        # HMarkupView
-        - morphanimation    # HMorphAnimation
-        - viewdefaults      # HViewDefaults
-        - view              # HView
-        - eventresponder    # HEventResponder
-        - dummyvalue        # HDummyValue
-        - eventmanager      # EVENT
-        - controldefaults   # HControlDefaults
-        - control           # HControl
-        - valueaction       # HValueAction
-        - dyncontrol        # HDynControl
-        - centerview        # HCenterView
-        - scrollview        # HScrollView
-        - inlineview        # HInlineView
-
-      # The default collection of simple control widgets (components)
-      controls:
-        - button            # HButton & HClickValueButton
-        - checkbox          # HCheckbox
-        - radiobutton       # HRadioButton
-        - stringview        # HStringView
-        - textcontrol       # HTextControl
-        - passwordcontrol   # HPasswordControl
-        - textarea          # HTextArea
-        - searchfield       # HSearchField
-        - uploader          # HUploader
-        - slider            # HSlider
-        - vslider           # HVSlider
-        - progressbar       # HProgressBar
-        - progressindicator # HProgressIndicator
-        - imageview         # HImageView
-        - stepper           # HStepper
-        - validatorview     # HValidatorView
-        - window            # HWindow
-        - tab               # HTab & HTabView & HTabItem
-        - sheet             # HSheet
-        - alert_sheet       # HAlertSheet
-        - confirm_sheet     # HConfirmSheet
-
-      # Server error message application ( the Reload / Reset Session dialog )
-      servermessage:
-        - reloadapp # ReloadApp
-
-      # Special package for Internet Explorer 6.0
-      iefix:
-        - iefix
-
-      # Date and time -related control widgets (components)
-      # These are not complete; they are still under development
-      # and will be included in the controls package when finalized.
-      datetime:
-        - datetimevalue       # HDateTime
-        - calendar            # HCalendar
-        - datetimepicker      # HDateTimePicker
-        - timesheet           # HTimeSheet
-        - timesheet_item      # HTimeSheetItem
-        - timesheet_item_edit # HTimeSheetItemEditor
-
-      # List related control widgets (components)
-      # These are not complete; they are still under development
-      # and will be included in the controls package when finalized.
-      lists:
-        - listitems           # HListItems
-        - checkboxlist        # HCheckboxList
-        - radiobuttonlist     # HRadiobuttonList
-        - propertylist        # HPropertyList
-        - propertylisteditor  # HPropertyEditor
-        - minimenu            # HMiniMenu
-        - minimenuitem        # HMiniMenuItem
-        - popupmenu           # HPopupMenu
-        - menuitem            # HMenuItem
-      
-      tables:
-        - table               # HTable
-
-      # Graphics related control widgets (components)
-      # These are not complete and there will probably never be any
-      # serious efforts to support legacy browsers, like old IE versions,
-      # unless someone is interested in sponsoring such efforts.
-      graphics:
-        - svgcontrol
-    
-    # Special packages that include other packages
-    :compound_packages:
-      rsence:
-        - core
-        - default_theme
-        - controls
-        - lists
-        - datetime
-        - tables
-        - graphics
-        - servermessage
-      std_widgets:
-        - default_theme
-        - controls
-        - lists
-        - datetime
-        - tables
-        - graphics
-        - servermessage
-
-    # List of variables and other names beginning
-    # with a underscore that should not be obfuscated
-    :reserved_names:
-      - _ID
-      - _id
-      - _WIDTH
-      - _width
-      - _HEIGHT
-      - _height
-      - _
-
-    # List of file extensions considered graphics image types.
-    # Used for theme graphics inclusion.
-    :gfx_formats:
-      - .jpg
-      - .gif
-      - .png
-      - .swf
-      - .svg
-      - .pdf
-
-    # If disabled, makes packages out of single source bundles automatically
-    :dont_pack_undefined: true
-
-    # Replacement prefix for obfuscated names
-    :repl_prefix: _
-
-    # If enabled, doesn't obfuscate code (useful for debugging)
-    :no_obfuscation: false
-
-    # If enabled, doesn't remove whitespace (useful for debugging)
-    :no_whitespace_removal: false
-
-    # If enabled, doesn't make gzipped packages
-    :no_gzip: false
-
-    # The strategy for gzip, a number between 0 and 9
-    #  - 0 means largest size, but fast compression
-    #  - 9 means smallest size, but slow compression
-    #  - any number in between is a compromise
-    :gz_strategy: 9
-
-
-

data/js/chat/chat_panel/chat_panel.coffee

@@ -0,0 +1,120 @@
+HChatPanel = HScrollView.extend
+  textSelectable: true
+  controlDefaults: HScrollView.prototype.controlDefaults.extend
+    scrollX: false
+    scrollY: 'auto'
+    selfOrientation: 'right'
+    otherOrientation: 'left'
+  defaultEvents:
+    resize: true
+  resize: ->
+    @refreshValue()
+  refreshValue: ->
+    return unless @typeChr(@value) == 'h'
+    if @speechBubbles
+      for _bubble in @speechBubbles
+        _bubble.die()
+    if @userIcons
+      for _userIcon in @userIcons
+        _userIcon.die()
+    @speechBubbles = []
+    @userIcons = []
+    _users = @value.users
+    _themeUser = {}
+    _defaultBubble = HVM.clone( HSpeechBubble.prototype.controlDefaults.prototype.colors )
+    for _userId, _user of _users
+      _colors = HVM.clone( _defaultBubble )
+      if _user.color_bg?
+        _gradientStart = _user.color_bg
+        _gradientStep1 = @hexColorSubtract( _gradientStart, '#111' )
+        _gradientStep2 = @hexColorSubtract( _gradientStep1, '#030303' )
+        _gradientEnd   = @hexColorAdd( _gradientStep2, '#111' )
+        _colors.start = _gradientStart
+        _colors.end = _gradientEnd
+        _colors.steps = [
+          [ 9, _gradientStep1 ]
+          [ 91, _gradientStep2 ]
+        ]
+      if _user.color_fg?
+        _colors.text = _user.color_fg
+      _themeUser[_userId] = _colors
+    _topPx = 3
+    _prevDate = new Date().getTime()/1000
+    _minWidth = @rect.width - 80
+    for [ _userId, _text, _date ], i in @value.lines
+      _nextLine = @value.lines[i+1]
+      if _nextLine?
+        _nextSame = ( _userId == _nextLine[0] )
+      else
+        _nextSame = false
+      _prevLine = @value.lines[i-1]
+      if _prevLine?
+        _prevSame = ( _userId == _prevLine[0] )
+      else
+        _nextSame = false
+      if _date?
+        # _date = new Date(_date*1000)
+        _prevDate = _date
+      else
+        _date = _prevDate
+      _userInfo = _users[_userId]
+      if _userInfo.self
+        _orientation = @options.selfOrientation
+      else
+        _orientation = @options.otherOrientation
+      if _orientation == 'right'
+        _rectBubble = [ 120, _topPx, null, 40, 40, null ]
+      else
+        _rectBubble = [ 40, _topPx, null, 40, 120, null ]
+      _bubble = HSpeechBubble.new( _rectBubble, @,
+        autoHeight: true
+        autoWidth: true
+        colors: _themeUser[_userId]
+        orientation: _orientation
+        value: _text
+      )
+      @speechBubbles.push( _bubble )
+      _bottomPx = _bubble.rect.bottom
+      _bottomDiff = _bottomPx - _topPx
+      if _bottomDiff < 48 and not _prevSame
+        _bubble.offsetBy( 0, 48 - _bottomDiff )
+      _bottomPx = _bubble.rect.bottom
+      _topPx = _bottomPx+3
+      if _nextSame
+        _bubble.setStyleOfPart('directionbg','display','none')
+        _bubble.setStyleOfPart('directionupperfg','display','none')
+        _bubble.setStyleOfPart('directionlowerfg','display','none')
+      else
+        _dateStr = HLocale.dateTime.formatDateTime( _date )
+        if _userInfo.name?
+          _name = _userInfo.name
+        else
+          _name = _userId
+        if _orientation == 'right'
+          _rectLabel = [ 120, _topPx, null, 18, 4, null ]
+          _rectIcon  = [ null, _topPx-34, 32, 32, 2, null ]
+          _styleLabel = { textAlign: 'right' }
+          _labelText = _dateStr+'&nbsp;&bull;&nbsp;<b>'+_name+'</b>'
+        else
+          _rectLabel = [ 4, _topPx, null, 18, 120, null ]
+          _rectIcon = [ 2, _topPx-34, 32, 32 ]
+          _styleLabel = { textAlign: 'left' }
+          _labelText = '<b>'+_name+'</b>&nbsp;&bull;&nbsp;'+_dateStr
+        _iconStyle =
+          border: '2px solid black'
+          borderRadius: '5px'
+        if _userInfo.icon?
+          _iconSrc = _userInfo.icon
+        else
+          _iconSrc = @getThemeGfxFile('user_anon.png')
+        _icon = HImageView.new( _rectIcon, @,
+          style: _iconStyle
+          value: _iconSrc
+        )
+        @userIcons.push( _icon )
+        _label = HLabel.new( _rectLabel, @,
+          style: _styleLabel
+          label: _labelText
+        )
+        @userIcons.push( _label )
+      @scrollToBottom()

data/js/chat/speech_bubble/speech_bubble.coffee

@@ -0,0 +1,56 @@
+HSpeechBubble = HControl.extend
+  textSelectable: true
+  componentName: 'speech_bubble'
+  markupElemNames: [
+    'bg'
+    'subview'
+    'value'
+    'directionbg'
+    'directionupperfg'
+    'directionlowerfg'
+  ]
+  controlDefaults: HControlDefaults.extend
+    orientation: 'left'
+    colors:
+      start: '#ffffff'
+      steps: [
+        [ 9, '#efefef' ]
+        [ 91, '#e0e0e0' ]
+      ]
+      end:   '#efefef'
+      text: '#333'
+    autoHeight: false
+    autoWidth:  false
+  adjustHeight: ->
+    if @options.autoHeight or @options.autoWidth
+      _size = ELEM.getScrollSize( @markupElemIds.value ) 
+    if @options.autoHeight
+      _height = _size[1] + 3
+      @rect.setHeight( _height )
+    if @options.autoWidth
+      _width = _size[0] + 25
+      @rect.setWidth( _width )
+    @drawRect() if @options.autoHeight or @options.autoWidth
+  setOrientationClass: (_orientation)->
+    if _orientation == 'left'
+      ELEM.addClassName( @elemId, 'orientation_left' )
+      ELEM.delClassName( @elemId, 'orientation_right' )
+    else
+      ELEM.addClassName( @elemId, 'orientation_right' )
+      ELEM.delClassName( @elemId, 'orientation_left' )
+  refreshProperties: ->
+    _colors = @options.colors
+    [ _bgKey, _bgVal ] = ELEM._linearGradientStyle(_colors)
+    @setOrientationClass(@options.orientation)
+    @setStyleOfPart( 'directionbg', 'borderColor', "transparent transparent #{_colors.text} transparent" )
+    @setStyleOfPart( 'directionupperfg', 'borderColor', "transparent transparent #{_colors.steps[_colors.steps.length-1][1]} transparent" )
+    @setStyleOfPart( 'directionlowerfg', 'borderColor', "transparent transparent #{_colors.end} transparent" )
+    @setStyleOfPart( 'bg', _bgKey, _bgVal )
+    @setStyleOfPart( 'bg', 'borderColor', _colors.text )
+    @setStyleOfPart( 'value', 'color', _colors.text )
+  refresh: ->
+    @base()
+    @refreshProperties() if @markupElemIds?
+  refreshValue: ->
+    @base()
+    @adjustHeight() if @options.autoHeight

data/js/chat/speech_bubble/themes/default/speech_bubble.css

@@ -0,0 +1,84 @@
+.default > .speechbubble,
+.default > .speechbubble > .subview,
+/*.default > .speechbubble > .text,*/
+.default > .speechbubble > .direction_inner,
+.default > .speechbubble > .direction_inner2,
+.default > .speechbubble > .direction {
+  position: absolute;
+}
+.default > .speechbubble {
+  top: 0; bottom: 0;
+  overflow: visible;
+  border: 2px solid #333; border-radius: 9px;
+}
+.default.orientation_left > .speechbubble {
+  left: 16px; right: 0;
+  border-bottom-left-radius: 0;
+}
+.default.orientation_right > .speechbubble {
+  right: 16px; left: 0;
+  border-bottom-right-radius: 0;
+}
+
+.default > .speechbubble > .text {
+  padding-left: 6px; padding-top: 3px; padding-bottom: 3px; padding-right: 6px;
+  vertical-align: middle;
+  font-family: Arial, sans-serif;
+  font-size: 12px; font-weight: bold;
+  color: #333;
+}
+/*.default.orientation_left > .speechbubble > .text {
+  left: 0;
+}
+.default.orientation_left > .speechbubble > .text {
+  right: 0;
+}
+.default.orientation_left > .speechbubble {
+  text-align: left;
+}
+.default.orientation_right > .speechbubble {
+  text-align: right;
+}*/
+.default > .speechbubble > .subview {
+  left: 0; top: 0; right: 0; bottom: 0;
+}
+.default > .speechbubble > .direction {
+  width: 0; height: 0;
+  border-style: solid;
+  border-color: transparent transparent #333 transparent;
+}
+.default.orientation_left > .speechbubble > .direction {
+  left: -16px; bottom: -2px;
+  border-width: 0 0 16px 16px; /* top, right, bottom, left */
+}
+.default.orientation_right > .speechbubble > .direction {
+  right: -16px; bottom: -2px;
+  border-width: 0 16px 16px 0;
+}
+.default > .speechbubble > .direction_inner {
+  width: 0; height: 0; bottom: 0;
+  border-style: solid;
+  border-color: transparent transparent #e0e0e0 transparent;
+}
+.default.orientation_left > .speechbubble > .direction_inner {
+  left: -11px;
+  border-width: 0 0 11px 11px;
+}
+.default.orientation_right > .speechbubble > .direction_inner {
+  right: -11px;
+  border-width: 0 11px 11px 0;
+}
+.default > .speechbubble > .direction_inner2 {
+  bottom: 0;
+  width: 0; height: 0;
+  border-style: solid;
+  border-color: transparent transparent #efefef transparent;
+}
+.default.orientation_left > .speechbubble > .direction_inner2 {
+  left: -11px; 
+  border-width: 0 0 4px 11px;
+}
+.default.orientation_right > .speechbubble > .direction_inner2 {
+  right: -11px; 
+  border-width: 0 11px 4px 0;
+}

data/js/chat/speech_bubble/themes/default/speech_bubble.html

@@ -0,0 +1,7 @@
+<div class="speechbubble" #{BROWSER_TYPE.ie9?'style="filter:none;" ':' '}id="bg#{_ID}">
+  <div class="subview" id="subview#{_ID}"></div>
+  <div class="direction" id="directionbg#{_ID}"></div>
+  <div class="direction_inner"  id="directionupperfg#{_ID}"></div>
+  <div class="direction_inner2" id="directionlowerfg#{_ID}"></div>
+  <div class="text" id="value#{_ID}"></div>
+</div>

data/js/comm/sessionwatcher/sessionwatcher.js

@@ -19,7 +19,7 @@ COMM.SessionWatcher = HApplication.extend({
     
     // gets the HValue represented by
     // sesTimeoutValueId (:client_time in server)
-    this.sesTimeoutValue = COMM.Values.values[_sesTimeoutValueId];
+    this.sesTimeoutValue = this.getValueById(_sesTimeoutValueId);
     this.timeoutSecs = _timeoutSecs;
     
     // onIdle is called when HSystem's ticker count % 100 == 0

data/js/comm/values/values.js

@@ -5,7 +5,7 @@
   ** Keeps track of all +HValue+ instances present.
 ***/
 //var//RSence.COMM
-COMM.Values = HClass.extend({
+COMM.Values = UtilMethods.extend({
   
 /** No constructor, singleton class.
   **/
@@ -116,13 +116,6 @@ COMM.Values = HClass.extend({
     }
   },
   
-  // List of primitive object types.
-  _builtins: [
-    'b', // boolean
-    'n', // number
-    's'  // string
-  ],
-  
 /** = Description
   * Use this method to detect the type of the object given.
   *
@@ -142,29 +135,7 @@ COMM.Values = HClass.extend({
   *
   **/
   type: function(_obj){
-    if(_obj === null){
-      return '~';
-    }
-    else if (_obj === undefined){
-      return '-';
-    }
-    var _type = (typeof _obj).slice(0,1);
-    if(~this._builtins.indexOf(_type)){
-      return _type;
-    }
-    else if(_type==='o'){
-      if(_obj.constructor === Array){
-        return 'a'; // array
-      }
-      else if(_obj.constructor === Object){
-        return 'h'; // hash
-      }
-      else if(_obj.constructor === Date){
-        return 'd'; // date
-      }
-      return false;
-    }
-    return false;
+    return this.typeChr( _obj );
   },
   
   // Returns an encoded version of the array _arr as a string
@@ -485,8 +456,6 @@ COMM.Values = HClass.extend({
         _syncValues.push( [ _id, _value ] );
       }
     }
-    // console.log('response:',_response);
-    // console.log('encoded:',_this.encode(_response));
     return _this.encode(_response);
   },
 
@@ -524,7 +493,6 @@ COMM.Values = HClass.extend({
     }
   }
 });
-
 COMM.Values._detectNativeJSONSupport();
 
 // Backwards compatibility assignment for code that still