rsence-pre 3.0.0.5 → 3.0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 704d65450d16a70de1c5bd816a2f7fa4c68d9bc6
-  data.tar.gz: 74fbb072f1270cf981514b96949078b88ff89f4e
+  metadata.gz: 04007e333814868e82a87b423d5a55ee5f411d9f
+  data.tar.gz: 135c7d9ab384cc0a5a90d81d7f6fba1757864ff8
 SHA512:
-  metadata.gz: 16727cb8b34689c452de3b57be2dd68b4b675fd480d95917a00aaf712d7ee4852afe8296f0a83354e24029e038f19f3f936d7b458cbc0b42210e451015ec6b56
-  data.tar.gz: 51dd8ea5057c58ff9469e5108a08a6a184852e60b3f599fd94ec84a3587da70a38a74e9e86c41eec28404ebb8f5c345d9ce3ea8cb083f09f2d266b4b85e1667b
+  metadata.gz: 53eb640329904169ba5585a7ecd781742f1cf1fbbf6d251369d62b84cdb62e47ddefb02fbe7fe34cfbca742ed87a2f3240bf3720f26c0c46fd6f1096a2ccd057
+  data.tar.gz: 90febdd9363b38547ce3f12fcb540e78e6e63c1ab20a22dc26e97d1f823f6b5b86b394ad0dce7538688c6851692b8553c6edcd6d9c6b260e56320c4508d5efad

data/VERSION

@@ -1 +1 @@
-3.0.0.5.pre
+3.0.0.6.pre

data/client/conf/client_pkg.yaml

@@ -13,24 +13,24 @@
 
   # The core package, loaded by default using a script tag in index_html
   core:
-    
+
     # RSence.*
     - rsence_ns
-    
+
     - locale_settings    # HLocaleSettings
-    
+
     # RSence.Core
     - class             # HClass
     - sha               # SHA
     - elem              # ELEM
     - event             # Event
     - util_methods      # UtilMethods
-    
+
     # RSence.Foundation
     - system            # HSystem
     - valueresponder    # HValueResponder
     - application       # HApplication
-    
+
     # COMM
     - comm              # COMM
     - queue             # COMM.Queue
@@ -47,7 +47,6 @@
     - point             # HPoint
     - rect              # HRect
     - thememanager      # HThemeManager
-    - markupview        # HMarkupView
     - morphanimation    # HMorphAnimation
     - viewdefaults      # HViewDefaults
     - view              # HView
@@ -64,7 +63,8 @@
 
   # The default collection of simple control widgets (components)
   controls:
-    - button            # HButton & HClickValueButton
+    - button            # HButton
+    - clickbutton       # HClickButton (HClickValueButton)
     - checkbox          # HCheckbox
     - onoffbutton       # HOnOffButton
     - radiobutton       # HRadioButton
@@ -120,7 +120,7 @@
     - minimenuitem        # HMiniMenuItem
     - popupmenu           # HPopupMenu
     - menuitem            # HMenuItem
-  
+
   tables:
     - table               # HTable
 

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

@@ -23,7 +23,7 @@
 .default > .speechbubble > .text {
   padding-left: 6px; padding-top: 3px; padding-bottom: 3px; padding-right: 6px;
   vertical-align: middle;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 12px; font-weight: bold;
   color: #333;
 }
@@ -75,10 +75,10 @@
   border-color: transparent transparent #efefef transparent;
 }
 .default.orientation_left > .speechbubble > .direction_inner2 {
-  left: -11px; 
+  left: -11px;
   border-width: 0 0 4px 11px;
 }
 .default.orientation_right > .speechbubble > .direction_inner2 {
-  right: -11px; 
+  right: -11px;
   border-width: 0 11px 4px 0;
 }

data/client/js/controls/button/button.coffee

@@ -0,0 +1,45 @@
+
+### = Description
+ ## Simple button component, designed to be extended for any
+ ## actual functionality above regular HControl.
+ ###
+HButton = HControl.extend
+
+  componentName: 'button'
+  optimizeWidthOnRefresh: true
+  controlDefaults: HControlDefaults.extend
+    defaultKeyClick: false
+    pack: false
+
+  defaultEvents:
+    click: true
+
+  ###
+  # = Description
+  # setStyle function for button.
+  #
+  ###
+  setStyle: (_name, _value, _setElemStyle)->
+    if _setElemStyle?
+      @base(_name,_value)
+    else
+      @setStyleOfPart('label',_name,_value)
+    @
+
+  defaultKey: ->
+    if @options.defaultKeyClick
+      @click()
+      return false
+    null
+
+  click: ->
+    console.log('no click action defined in HButton') if !@isProduction
+
+  labelPadding: 0
+  optimizeWidth: ->
+    _labelWidth = @stringWidth(@label,null,@markupElemIds.label)
+    _labelWidth += @labelPadding+Math.floor(@rect.height*0.6)
+    if @rect.width != _labelWidth
+      # console.log(@viewId,'labelWidth:',@rect.width,'->',_labelWidth)
+      @rect.setWidth(_labelWidth)
+      @drawRect()

data/client/js/controls/button/themes/default/button.css

@@ -1,89 +1,56 @@
 
-.button_control,
-.button_edge_left,
-.button_center,
-.button_edge_right,
-.button_label,
-.button_antiselect {
+.default > .button_control,
+.default > .button_control > .button_bg,
+.default > .button_control > .button_label {
   position: absolute;
-  top: 0px; height: 24px;
 }
-
-.button_control {
-  left: 0px; right: 0px;
+.default > .button_control {
   cursor: pointer;
+  top: 0; left: 0; right: 0; bottom: 0;
 }
-.disabled .button_control {
+.default.disabled > .button_control {
   cursor: default;
 }
-
-.button_edge_left,
-.button_center,
-.button_edge_right {
-  background-repeat: repeat-x;
-  background-image: #{this.getCssFilePath('button_parts1.png')};
-}
-
-.button_edge_left {
-  left: 0px; width: 6px;
-  background-position: 0px 0px;
-}
-.disabled > .button_control > .button_edge_left {
-  background-position: 0px -144px;
-}
-.enabled > .button_control:hover > .button_edge_left {
-  background-position: 0px -48px;
-}
-.enabled > .button_control:active > .button_edge_left {
-  background-position: 0px -96px;
-}
-
-.button_edge_right {
-  right: 0px; width: 6px;
-  background-position: -42px 0px;
-}
-.disabled > .button_control > .button_edge_right {
-  background-position: -42px -144px;
-}
-.enabled > .button_control:hover > .button_edge_right {
-  background-position: -42px -48px;
-}
-.enabled > .button_control:active > .button_edge_right {
-  background-position: -42px -96px;
-}
-
-.button_center {
-  left: 6px; right: 6px;
-  background-position: 0px -24px;
-}
-.disabled > .button_control > .button_center {
-  background-position: 0px -168px;
-}
-.enabled > .button_control:hover > .button_center {
-  background-position: 0px -72px;
-}
-.enabled > .button_control:active > .button_center {
-  background-position: 0px -120px;
-}
-
-.button_label {
-  left: 6px; right: 6px; top: 2px;
-  height: 20px; line-height: 20px;
+.default > .button_control > .button_bg {
+  top: 2px; left: 2px; right: 2px; bottom: 3px;
+  border: 1px solid #e0e0e0;
+  border-top: 0; border-left: 0;
+  box-shadow: 0px 0px 3px #333;
+  #{this.gradientCSS('#fcfcfc',[45,'#fff'],[55,'#fdfdfd'],[75,'#f3f3f3'],'#f0f0f0')}
+}
+.default.disabled > .button_control > .button_bg {
+  border-color: #ddd;
+  box-shadow: 0px 0px 3px #666;
+  opacity: 0.75;
+  #{this.gradientCSS('#d6d6d6',[66,'#d0d0d0'],[71,'#d3d3d3'],'#ccc')}
+}
+.default > .button_control > .button_label {
+  left: 6px; right: 6px; top: 2px; bottom: auto;
   text-align: center; vertical-align: middle;
-  font-family: Arial, sans-serif;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-family: Helvetica, Arial, sans-serif;
+  text-shadow: 0 0 2px #fff;
   font-size: 12px; font-weight: bold;
   color: #333;
 }
-.disabled > .button_control > .button_label {
+.default.disabled > .button_control > .button_label {
   color: #999;
 }
-.enabled > .button_control:hover > .button_label {
-  color: #000;
+.default.enabled > .button_control:hover > .button_bg {
+  box-shadow: 0px 0px 3px #000;
+  #{this.gradientCSS('#f6f6f6',[66,'#fff'],[71,'#fcfcfc'],'#f0f0f0')}
 }
-.enabled > .button_control:active > .button_label {
+.default.enabled > .button_control:hover > .button_label {
   color: #000;
 }
-
-.button_antiselect {
-  left: 0px; right: 0px;
+.default.enabled > .button_control:active > .button_bg {
+  border: 1px solid #fff;
+  border-bottom: 0; border-right: 0;
+  box-shadow: 0px 0px 3px #000;
+  #{this.gradientCSS('#e6e6e6',[29,'#f0f0f0'],[33,'#f6f6f6'],'#fff')}
+}
+.default.enabled > .button_control:active > .button_label {
+  color: #000;
 }

data/client/js/controls/button/themes/default/button.html

@@ -1,7 +1,17 @@
 <div class="button_control" id="control]I[">
-  <div class="button_edge_left"></div>
-  <div class="button_center"></div>
-  <div class="button_edge_right"></div>
+  <div class="button_bg" id="bg]I["></div>
   <div class="button_label" id="label]I[">#{this.label}</div>
-  <div class="button_antiselect"></div>
 </div>
+${#!coffee
+@labelPadding = 12
+@themeStyle = ->
+  _labelHeight = (@rect.height-4)+'px'
+  _fontSize = Math.floor(@rect.height*0.5)+'px'
+  for [_key,_value] in [
+      ['height',_labelHeight],
+      ['lineHeight',_labelHeight],
+      ['fontSize',_fontSize] ]
+    @setStyleOfPart('label',_key,_value)
+  _radius = Math.floor(@rect.height / 6)+'px'
+  @setStyleOfPart('bg','borderRadius',_radius)
+}

data/client/js/controls/checkbox/checkbox.js

@@ -7,11 +7,7 @@ var//RSence.Controls
 HCheckbox = HButton.extend({
 
   componentName: 'checkbox',
-  
-  defaultEvents: {
-    click: true
-  },
-  
+
 /** Toggles the value checked / unchecked.
   **/
   click: function(){
@@ -20,10 +16,15 @@ HCheckbox = HButton.extend({
 /** SetStyle function for HCheckBox
   **/
   setStyle: function(_name,_value,_bypass){
-    this.setStyleOfPart('label',_name,_value,_bypass);
+    if(_bypass || !this.markupElemIds.label){
+      this.base(_name,_value,_bypass);
+    }
+    else {
+      this.setStyleOfPart('label',_name,_value);
+    }
   },
-  
-/**Toggles the checked/unchecked css-class status 
+
+/**Toggles the checked/unchecked css-class status
   according to the trueness of the value.**/
   refreshValue: function(){
     if(this.markupElemIds.control){

data/client/js/controls/checkbox/themes/default/checkbox.css

@@ -49,7 +49,7 @@
   left: 24px; right: 0px; top: 2px;
   height: 20px; line-height: 20px;
   text-align: left; vertical-align: middle;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 12px;
   color: #333;
 }

data/client/js/controls/checkbox/themes/default/checkbox.html

@@ -3,3 +3,4 @@
   <div class="checkbox_label" id="label]I[">#{this.label}</div>
   <div class="checkbox_antiselect"></div>
 </div>
+${this.labelPadding=24}

data/client/js/controls/clickbutton/clickbutton.coffee

@@ -0,0 +1,44 @@
+### = Description
+ ## Simple HButton extension, operates on its value so it's useful
+ ## for sending button clicks to the server and the like.
+ ## For the value responder, reset the value to 0 when read to make
+ ## the button clickable again.
+ ##
+ ## = Value states
+ ## +0+::     Enabled, clickable
+ ## +1+::     Disabled, clicked
+ ## +Other+:: Disabled, not clickable, not clicked
+ ###
+HClickButton = HButton.extend
+
+  defaultEvents:
+    click: true
+
+  controlDefaults: HButton.prototype.controlDefaults.extend
+    clickOnValue: 1
+    clickOffValue: 0
+
+  ###
+  # = Description
+  # Sets the button enabled if this.value is 0.
+  #
+  ###
+  refreshValue: ->
+    if @options.inverseValue
+      @setEnabled( @value == @options.clickOnValue )
+    else
+      @setEnabled( @value == @options.clickOffValue )
+
+  ###
+  # = Description
+  # Click method, sets the value to disabled if the button is enabled.
+  #
+  ###
+  click: ->
+    if @enabled
+      if @options.inverseValue
+        @setValue( @options.clickOffValue )
+      else
+        @setValue( @options.clickOnValue )
+
+HClickValueButton = HClickButton

data/client/js/controls/onoffbutton/themes/default/onoffbutton.css

@@ -1,50 +1,51 @@
-.onoffbutton_label,
-.onoffbutton_label_off {
+.default > .button_control > .onoffbutton_label,
+.default > .button_control > .onoffbutton_label_off {
   position: absolute;
   top: 2px; height: 20px; line-height: 20px;
   text-align: center; vertical-align: middle;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 12px; font-weight: bold;
+  text-shadow: 0 0 2px #fff;
   color: #333;
 }
-.onoffbutton_label {
-  left: 6px; right: 50%; 
+.default > .button_control > .onoffbutton_label {
+  left: 6px; right: 50%;
 }
-.onoffbutton_label_off {
-  right: 6px; left: 50%; 
+.default > .button_control > .onoffbutton_label_off {
+  right: 6px; left: 50%;
 }
-.disabled > .button_control > .onoffbutton_label,
-.disabled > .button_control > .onoffbutton_label_off {
+.default.disabled > .button_control > .onoffbutton_label,
+.default.disabled > .button_control > .onoffbutton_label_off {
   color: #999;
 }
-.enabled > .button_control:hover > .onoffbutton_label,
-.enabled > .button_control:active > .onoffbutton_label_off {
+.default.enabled > .button_control:hover > .onoffbutton_label,
+.default.enabled > .button_control:active > .onoffbutton_label_off {
   color: #000;
 }
-.enabled > .button_control:active > .onoffbutton_label,
-.enabled > .button_control:active > .onoffbutton_label_off {
+.default.enabled > .button_control:active > .onoffbutton_label,
+.default.enabled > .button_control:active > .onoffbutton_label_off {
   color: #000;
 }
-.onoffbutton_on,
-.onoffbutton_off {
+.default > .button_control > .onoffbutton_on,
+.default > .button_control > .onoffbutton_off {
   position: absolute;
   display: none;
   top: 1px; height: 20px;
   opacity: 0.6;
 }
-.onoffbutton_off {
+.default > .button_control > .onoffbutton_off {
   left: 50%; right: 1px;
   background-color: #660000;
   border-bottom-right-radius: 3px;
   border-top-right-radius: 3px;
 }
-.onoffbutton_on {
+.default > .button_control > .onoffbutton_on {
   right: 50%; left: 1px;
   background-color: #006600;
   border-bottom-left-radius: 3px;
   border-top-left-radius: 3px;
 }
-.disabled > .button_control > .onoffbutton_off,
-.disabled > .button_control > .onoffbutton_on {
+.default.disabled > .button_control > .onoffbutton_off,
+.default.disabled > .button_control > .onoffbutton_on {
   opacity: 0.3;
 }

data/client/js/controls/onoffbutton/themes/default/onoffbutton.html

@@ -1,10 +1,7 @@
 <div class="button_control" id="control]I[">
-  <div class="button_edge_left"></div>
-  <div class="button_center"></div>
-  <div class="button_edge_right"></div>
+  <div class="button_bg" id="bg]I["></div>
   <div class="onoffbutton_on" id="onvalue]I["></div>
   <div class="onoffbutton_off" id="offvalue]I["></div>
   <div class="onoffbutton_label" id="label]I[">#{this.label}</div>
   <div class="onoffbutton_label_off" id="offlabel]I[">#{this.offLabel}</div>
-  <div class="button_antiselect"></div>
 </div>

data/client/js/controls/radiobutton/themes/default/radiobutton.css

@@ -49,7 +49,7 @@
   left: 24px; right: 0px; top: 0px;
   height: 20px; line-height: 24px;
   text-align: left; vertical-align: middle;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 12px;
   color: #333;
 }

data/client/js/controls/radiobutton/themes/default/radiobutton.html

@@ -3,3 +3,4 @@
   <div class="radiobutton_label" id="label]I[">#{this.label}</div>
   <div class="radiobutton_antiselect"></div>
 </div>
+${this.labelPadding=24}

data/client/js/controls/searchfield/searchfield.coffee

@@ -1,6 +1,6 @@
 HSearchField = HTextControl.extend
   componentName: 'searchfield'
-  markupElemNames: ['help'].concat( HTextControl.prototype.markupElemNames )
+  markupElemNames: HTextControl.prototype.markupElemNames.slice().concat('help')
   controlDefaults: HTextControl.prototype.controlDefaults.extend
     helpText: 'Search...'
 

data/client/js/controls/searchfield/themes/default/searchfield.css

@@ -2,7 +2,7 @@
 .default .searchfield_input {
   position: absolute;
   display: block;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   font-size: 13px;
   color: #000;
   background-color: transparent;

data/client/js/controls/stringview/themes/default/stringview.css

@@ -2,7 +2,7 @@
   color: #333;
   padding: 1px;
   font-size: 12px;
-  font-family: Arial, sans-serif;
+  font-family: Helvetica, Arial, sans-serif;
   overflow-y: visible;
 }
 

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

@@ -34,7 +34,7 @@ HTab = HControl.extend({
   componentName: "tab",
   refreshOnValueChange: true,
   refreshOnLabelChange: false,
-  
+
   controlDefaults: (HControlDefaults.extend({
     constructor: function(_ctrl){
       this.tabInit(_ctrl);
@@ -46,22 +46,22 @@ HTab = HControl.extend({
       _ctrl.tabLabelStrings = [];
     }
   })),
-  
+
   rightmostPx: 0,
   selectIdx: -1,
-  
+
   // overridden in the template
   tabLabelHeight: 20,
-  
+
   // overridden in the template
   tabLabelLeftEdge: 4,
-  
+
   // overridden in the template
   tabLabelRightEdge: 4,
-  
+
   // overridden in the template
-  fontStyle: 'font-family:Arial,sans-serif;font-size:13px;',
-  
+  fontStyle: 'font-family: Helvetica, Arial, sans-serif;font-size:13px;',
+
   tabLabelHTMLPrefix1: '<div class="edge_left"></div><div class="tablabel" style="width:',
   tabLabelHTMLPrefix2: 'px">',
   tabLabelHTMLSuffix: '</div><div class="edge_right"></div>',
@@ -71,7 +71,7 @@ HTab = HControl.extend({
   tabLabelFillBg: false,
   tabTriggerLink: true,
   tabLabelNoHTMLPrefix: false,
-  
+
 /** = Description
   * refreshValue function
   *
@@ -87,7 +87,7 @@ HTab = HControl.extend({
       }
     }
   },
-  
+
 /** = Description
   * Sets label for the tab.
   *
@@ -98,7 +98,7 @@ HTab = HControl.extend({
   setLabel: function(_label){
     this.label = _label;
   },
-  
+
 /** = Description
   * selectTab function
   *
@@ -127,7 +127,7 @@ HTab = HControl.extend({
     this.selectIdx = _tabIdx;
     this.setValue(_tabIdx);
   },
-  
+
 /** = Description
   * addTab function
   *
@@ -190,7 +190,7 @@ HTab = HControl.extend({
     }
     return _tab;
   },
-  
+
 /** = Description
   * click function
   *
@@ -220,10 +220,10 @@ HTab = HControl.extend({
           }
         }
       }
-      
+
     }
   },
-  
+
 /** = Description
   * removeTab function
   *
@@ -258,7 +258,7 @@ HTab = HControl.extend({
     }
     ELEM.del(_tabLabelElemId);
     HSystem.views[_tabViewId].die();
-    
+
     //Reset labels positions
     this.rightmostPx = 0;
     for(; i < this.tabs.length; i++){
@@ -284,7 +284,7 @@ HTab = HControl.extend({
   * select: true|false, passed on to addTab
   * label: true|false, passed on to addTab
   *
-  * = Returns 
+  * = Returns
   * a new HTabView instance returned by addTab
   *
   **/