rsence-pre 3.0.0.9 → 3.0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99b457f1d439877cd2926e8609e5c1545558534f
-  data.tar.gz: 5a20ca0ee688f859946145175fe0e7127bd87dca
+  metadata.gz: 1d5b5f7d60608bbab206276e6e1f1fe3a078fdc1
+  data.tar.gz: d460c435b926b1d001c0079e60d03ee26bac4b9a
 SHA512:
-  metadata.gz: 28a2abfa6afa5e310262b3420cdbf99f4fee16d28fac1a15bb8a40a3cf1ec99bb27a787649ecf7864caeb6890504dfe4a4951513e279b12dcbf4e23de032564d
-  data.tar.gz: 1738b4fa751e468bc48d55f11ed29997695cb0723effb9f6401a69bb23b1854f2e812a2288ba2a2af7c8ae8a45dd9f3a2be117245f6f0fb9618bef72a55979ba
+  metadata.gz: 2508420c6dbf347f43781cdb5ff772341df775f4867128a0b385d8c4a254e3f91d037fd306a92f58470e64d2c7f51e2cf12d606da91450ec52ebaaf6b5065435
+  data.tar.gz: 25ffa628cc7916db622b614ad8a883191ec97be900945c17d0695e17e79a112abf6c238d4e6e88eef9b36561ade57f74e55433d447292ad47224d01b862f8ce7

data/VERSION

@@ -1 +1 @@
-3.0.0.9.pre
+3.0.0.10.pre

data/client/ext/Rakefile

@@ -0,0 +1,18 @@
+
+path = File.split(__FILE__).first
+task :momentjs do
+  moment_url = 'https://github.com/timrwood/moment.git'
+  moment_path = File.expand_path( 'moment', path )
+  if File.exist? moment_path
+    `cd "#{moment_path}"; git pull`
+  else
+    `git clone #{moment_url} "#{moment_path}"`
+  end
+  client_path = File.split( path ).first
+  src_js = File.expand_path( 'moment.js', moment_path )
+  tgt_js = File.expand_path( 'js/datetime/momentjs/momentjs.js', client_path )
+  `cp #{src_js} #{tgt_js}`
+end
+
+task :all => :momentjs
+task :default => :all

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

@@ -11,7 +11,7 @@ ${#!coffee
       ['height',_labelHeight],
       ['lineHeight',_labelHeight],
       ['fontSize',_fontSize] ]
-    @setStyleOfPart('label',_key,_value)
+    @setStyleOfPart('label',_key,_value) unless @options.style? and @options.style[_key]?
   _radius = Math.floor(@rect.height / 6)+'px'
   @setStyleOfPart('bg','borderRadius',_radius)
 }

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

@@ -28,15 +28,20 @@ HCheckbox = HButton.extend({
   according to the trueness of the value.**/
   refreshValue: function(){
     if(this.markupElemIds.control){
+      !this.isProduction && console.log('Please update your theme of ',this.componentName,' to current checkbox/radiobutton mode: the cell should be the checked element, not the control part.');
       if(this.value){
-        this.setCSSClass('control', 'checked');
-        this.unsetCSSClass('control', 'unchecked');
+        this.setCSSClass('control','checked');
+        this.unsetCSSClass('control','unchecked');
       }
       else{
-        this.unsetCSSClass('control', 'checked');
-        this.setCSSClass('control', 'unchecked');
+        this.setCSSClass('control','unchecked');
+        this.unsetCSSClass('control','checked');
       }
     }
+    else{
+      if(this.value){this.setCSSClass('checked');}
+      else{this.unsetCSSClass('checked');}
+    }
   }
 });
 //-- Alias for some users:++

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

@@ -1,51 +1,45 @@
-.checkbox_control,
-.checkbox_state,
-.checkbox_label,
-.checkbox_antiselect {
-  position: absolute; height: 24px;
-}
-.checkbox_control {
+.default.checkbox {
   left: 0px; top: 0px; right: 0px;
   cursor: pointer;
 }
-.disabled > .checkbox_control {
+.default.checkbox.disabled {
   cursor: default;
 }
-.checkbox_state {
+.default.checkbox.checkbox > .state,
+.default.checkbox.checkbox > .label {
+  position: absolute; height: 24px;
+}
+.default.checkbox > .state {
   left: 0px; top: 0px; width: 24px;
   background-repeat: no-repeat;
   background-position: -24px 0px;
-  background-image: #{this.getCssFilePath('checkbox_parts1.png')};
-}
-
-.enabled > .unchecked > .checkbox_state {
-  background-position: -24px 0px;
+  background-image: #url(checkbox_parts1.png);
 }
-.enabled > .unchecked:hover > .checkbox_state {
+.default.checkbox.enabled:hover > .state {
   background-position: -24px -24px;
 }
-.enabled > .unchecked:active > .checkbox_state {
+.default.checkbox.enabled:active > .state {
   background-position: -24px -48px;
 }
 
-.enabled > .checked > .checkbox_state {
+.default.checkbox.enabled.checked > .state {
   background-position: 0px 0px;
 }
-.enabled > .checked:hover > .checkbox_state {
+.default.checkbox.enabled.checked:hover > .state {
   background-position: 0px -24px;
 }
-.enabled > .checked:active > .checkbox_state {
+.default.checkbox.enabled.checked:active > .state {
   background-position: 0px -48px;
 }
 
-.disabled > .unchecked > .checkbox_state {
+.default.checkbox.disabled > .state {
   background-position: -24px -72px;
 }
-.disabled > .checked > .checkbox_state {
+.default.checkbox.disabled.checked > .state {
   background-position: 0px -72px;
 }
 
-.checkbox_label {
+.default.checkbox > .label {
   left: 24px; right: 0px; top: 2px;
   height: 20px; line-height: 20px;
   text-align: left; vertical-align: middle;
@@ -53,17 +47,13 @@
   font-size: 12px;
   color: #333;
 }
-.disabled > .checkbox_control > .checkbox_label {
+.default.checkbox.disabled > .label {
   color: #999;
 }
-.enabled > .checkbox_control:hover > .checkbox_label {
+.default.checkbox.enabled:hover > .label {
   color: #000;
 }
-.enabled > .checkbox_control:active > .checkbox_label {
+.default.checkbox.enabled:active > .label {
   color: #000;
 }
 
-.checkbox_antiselect {
-  left: 0px; top: 0px; right: 0px;
-}
-

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

@@ -1,6 +1,8 @@
-<div class="checkbox_control#{this.value?' checked':' unchecked'}" id="control]I[">
-  <div class="checkbox_state" id="state]I["></div>
-  <div class="checkbox_label" id="label]I[">#{this.label}</div>
-  <div class="checkbox_antiselect"></div>
-</div>
-${this.labelPadding=24}
+<div class="state" id="state]I["></div>
+<div class="label" id="label]I[">#{this.label}</div>
+${#!coffee
+@labelPadding=24
+@pushTask =>
+  @refreshValue()
+  @markupElemIds.control = @elemId
+}

data/client/js/controls/dialogs/sheet/themes/default/sheet.css

@@ -1,68 +1,63 @@
-.sheet_bg,
-.sheet_body,
-.sheet_dimmer,
-/*.sheet_center,*/
-.sheet_content,
-.sheet_body_edge_left,
-.sheet_body_edge_right,
-.sheet_body_corner_left,
-.sheet_body_corner_right,
-.sheet_body_edge_bottom,
-.sheet_subview {
+.default.sheet > .content > .bg,
+.default.sheet > .content > .body,
+.default.sheet > .dimmer,
+.default.sheet > .content,
+.default.sheet > .content > .body > .w,
+.default.sheet > .content > .body > .e,
+.default.sheet > .content > .body > .sw,
+.default.sheet > .content > .body > .se,
+.default.sheet > .content > .body > .s,
+.default.sheet > .content > .subview {
   position: absolute;
   display: block;
   overflow: hidden;
   cursor: inherit;
   background-repeat: no-repeat;
 }
-.sheet_dimmer {
+.default.sheet > .dimmer {
   top: 0; left: 0; right: 0; bottom: 0;
   background-repeat: repeat;
-  background-image: #{this.getCssFilePath('sheet_dim.png')};
+  background-image: #url(sheet_dim.png)
 }
-/*.sheet_center {
-  top: 0; left: 50%; overflow: visible; width: 0; height: 0;
-}
-*/
-.sheet_content {
+.default.sheet > .content {
   top: 0; left: -2px; right: -2px; bottom: -2px; overflow: visible;
 }
-.sheet_bg {
+.default.sheet > .content > .bg {
   left: 24px; top: 0; right: 24px; bottom: 24px;
   background-repeat: repeat;
-  background-image: #{this.getCssFilePath('sheet_bg.png')};
+  background-image: #url(sheet_bg.png)
 }
-.sheet_body {
+.default.sheet > .content > .body {
   left: 0; top: 0; right: 0; bottom: 0; overflow: visible;
 }
-.sheet_body > * {
-  background-image: #{this.getCssFilePath('sheet_parts1.png')};
+.default.sheet > .content > .body > * {
+  background-image: #url(sheet_parts1.png)
 }
-.sheet_body_edge_left {
+.default.sheet > .content > .body > .w {
   left: 0; top: 0; bottom: 24px; width: 24px;
   background-repeat: repeat-y;
   background-position: -48px 0;
 }
-.sheet_body_edge_right {
+.default.sheet > .content > .body > .e {
   right: 0; top: 0; bottom: 24px; width: 24px;
   background-repeat: repeat-y;
   background-position: -72px 0;
 }
-.sheet_body_corner_left {
+.default.sheet > .content > .body > .sw {
   left: 0; bottom: 0; height: 24px; width: 24px;
   background-position: 0 0;
 }
-.sheet_body_corner_right {
+.default.sheet > .content > .body > .se {
   right: 0; bottom: 0; height: 24px; width: 24px;
   background-position: -24px 0;
 }
-.sheet_body_edge_bottom {
+.default.sheet > .content > .body > .s {
   left: 24px; bottom: 0; right: 24px; height: 24px;
   background-repeat: repeat-x;
   background-position: 0 0;
-  background-image: #{this.getCssFilePath('sheet_parts2.png')};
+  background-image: #url(sheet_parts2.png)
 }
-.sheet_subview {
+.default.sheet > .content > .subview {
   left: 2px; top: 0; right: 2px; bottom: 2px;
 }
 

data/client/js/controls/dialogs/sheet/themes/default/sheet.html

@@ -1,12 +1,12 @@
-<div class="sheet_dimmer" id="dimmer]I["></div>
-<div class="sheet_content" id="state]I[">
-  <div class="sheet_bg" id="bg]I["></div>
-  <div class="sheet_body">
-    <div class="sheet_body_edge_left"></div>
-    <div class="sheet_body_edge_right"></div>
-    <div class="sheet_body_edge_bottom"></div>
-    <div class="sheet_body_corner_left"></div>
-    <div class="sheet_body_corner_right"></div>
+<div class="dimmer" id="dimmer]I["></div>
+<div class="content" id="state]I[">
+  <div class="bg" id="bg]I["></div>
+  <div class="body">
+    <div class="w"></div>
+    <div class="e"></div>
+    <div class="s"></div>
+    <div class="sw"></div>
+    <div class="se"></div>
   </div>
-  <div class="sheet_subview" id="subview]I["></div>
+  <div class="subview" id="subview]I["></div>
 </div>

data/client/js/controls/numerictextcontrol/numerictextcontrol.coffee

@@ -11,7 +11,7 @@ HNumericTextControl = HTextControl.extend
     mouseWheel:  true
     contextMenu: true
     keyDown:     true
-    textEnter:   false
+    textEnter:   true
     click:       true
     contextMenu: true
 
@@ -57,10 +57,15 @@ HNumericTextControl = HTextControl.extend
       _value = parseInt( _value, 10 )
     if isNaN( _value )
       _value = @value
+      @setValid(false)
     if _value > @maxValue
       _value = @maxValue
+      @setValid(false)
     else if _value < @minValue
+      @setValid(false)
       _value = @minValue
+    else
+      @setValid(true)
     _value
 
   fieldToValue: (_unFilteredValue)->
@@ -95,9 +100,7 @@ HNumericTextControl = HTextControl.extend
   ###
   # validateText: (_value)-> _value
 
-  _extraLabelRight: 0
   drawSubviews: ->
-    @base()
     @setStyleOfPart('value','textAlign','right')
     if @options.withStepper
       this._extraLabelRight += 14
@@ -116,16 +119,6 @@ HNumericTextControl = HTextControl.extend
         enabled: @enabled
       )
       @stepper.bringToFront()
-    if @options.unit
-      _unitRect = [null,null,4,@rect.height,4,0]
-      @unitSuffix = HLabel.new(_unitRect,@,
-        pack: true
-        label: @options.unit
-        style:
-          lineHeight: @rect.height+'px'
-          verticalAlign: 'middle'
-      )
-      @_extraLabelRight += @unitSuffix.rect.width
-      @setStyleOfPart('label','right',this._extraLabelRight+'px')
+    @drawUnit()
 
 HNumberField = HNumericTextControl

data/client/js/controls/passwordcontrol/passwordcontrol.js

@@ -8,8 +8,4 @@
   **
   ***/
 var//RSence.Controls
-HPasswordControl = HTextControl.extend({
-  
-  componentName: 'passwordcontrol'
-  
-});
+HPasswordControl = HTextControl.extend({fieldType: 'password'});

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

@@ -1,69 +1,59 @@
-.radiobutton_control,
-.radiobutton_state,
-.radiobutton_label,
-.radiobutton_antiselect {
-  position: absolute; height: 24px;
-}
-.radiobutton_control {
+.default.radiobutton {
   left: 0px; top: 0px; right: 0px;
   cursor: pointer;
 }
-.disabled > .radiobutton_control {
+.default.radiobutton.disabled {
   cursor: default;
 }
-.radiobutton_state {
+.default.radiobutton.radiobutton > .state,
+.default.radiobutton.radiobutton > .label {
+  position: absolute; height: 24px;
+}
+.default.radiobutton > .state {
   left: 0px; top: 0px; width: 24px;
   background-repeat: no-repeat;
   background-position: -24px 0px;
-  background-image: #{this.getCssFilePath('radiobutton_parts1.png')};
-}
-
-.enabled > .unchecked > .radiobutton_state {
-  background-position: -24px 0px;
+  background-image: #url(radiobutton_parts1.png);
 }
-.enabled > .unchecked:hover > .radiobutton_state {
+.default.radiobutton.enabled:hover > .state {
   background-position: -24px -24px;
 }
-.enabled > .unchecked:active > .radiobutton_state {
+.default.radiobutton.enabled:active > .state {
   background-position: -24px -48px;
 }
 
-.enabled > .checked > .radiobutton_state {
+.default.radiobutton.enabled.checked > .state {
   background-position: 0px 0px;
 }
-.enabled > .checked:hover > .radiobutton_state {
+.default.radiobutton.enabled.checked:hover > .state {
   background-position: 0px -24px;
 }
-.enabled > .checked:active > .radiobutton_state {
+.default.radiobutton.enabled.checked:active > .state {
   background-position: 0px -48px;
 }
 
-.disabled > .unchecked > .radiobutton_state {
+.default.radiobutton.disabled > .state {
   background-position: -24px -72px;
 }
-.disabled > .checked > .radiobutton_state {
+.default.radiobutton.disabled.checked > .state {
   background-position: 0px -72px;
 }
 
-.radiobutton_label {
-  left: 24px; right: 0px; top: 0px;
-  height: 20px; line-height: 24px;
+.default.radiobutton > .label {
+  left: 24px; right: 0px; top: 2px;
+  height: 20px; line-height: 20px;
   text-align: left; vertical-align: middle;
   font-family: Helvetica, Arial, sans-serif;
   font-size: 12px;
   color: #333;
 }
-.disabled > .radiobutton_control > .radiobutton_label {
+.default.radiobutton.disabled > .label {
   color: #999;
 }
-.enabled > .radiobutton_control:hover > .radiobutton_label {
+.default.radiobutton.enabled:hover > .label {
   color: #000;
 }
-.enabled > .radiobutton_control:active > .radiobutton_label {
+.default.radiobutton.enabled:active > .label {
   color: #000;
 }
 
-.radiobutton_antiselect {
-  left: 0px; top: 0px; right: 0px;
-}
-

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

@@ -1,6 +1,8 @@
-<div class="radiobutton_control#{this.value?' checked':' unchecked'}" id="control]I[">
-  <div class="radiobutton_state" id="state]I["></div>
-  <div class="radiobutton_label" id="label]I[">#{this.label}</div>
-  <div class="radiobutton_antiselect"></div>
-</div>
-${this.labelPadding=24}
+<div class="state" id="state]I["></div>
+<div class="label" id="label]I[">#{this.label}</div>
+${#!coffee
+@labelPadding=24
+@pushTask =>
+  @refreshValue()
+  @markupElemIds.control = @elemId
+}

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

@@ -45,7 +45,7 @@
   position: absolute;
   height: 24px;
   background-repeat: no-repeat;
-  background-image: #{this.getCssFilePath('searchfield_parts1.png')};
+  background-image: #url(searchfield_parts1.png);
 }
 
 .default .searchfield_fade {

data/client/js/controls/sliders/slider/themes/default/slider.css

@@ -5,7 +5,7 @@
   height: 7px; top: 7px;
   font-size: 0;
   cursor: col-resize;
-  background-image: #{this.getCssFilePath('hslider_tracks.png')};
+  background-image: #url(hslider_tracks.png);
 }
 
 .slider_track_left {
@@ -42,7 +42,7 @@
   font-size: 0;
   cursor: col-resize;
   background-position: 0 0;
-  background-image: #{this.getCssFilePath('slider_thumbs.png')};
+  background-image: #url(slider_thumbs.png);
 }
 
 .slider_thumb:active {
@@ -58,7 +58,7 @@
   position: absolute;
   cursor: col-resize;
   top: 0; height: 21px; width: 21px;
-  background-image: #{this.getCssFilePath('slider_thumbs.png')};
+  background-image: #url(slider_thumbs.png);
 }
 
 .slider_thumb_n {

data/client/js/controls/sliders/vslider/themes/default/vslider.css

@@ -5,7 +5,7 @@
   width: 7px; left: 7px;
   font-size: 0;
   cursor: row-resize;
-  background-image: #{this.getCssFilePath('vslider_tracks.png')};
+  background-image: #url(vslider_tracks.png);
 }
 
 .vslider_track_top {
@@ -41,7 +41,7 @@
   left: 0; width: 21px; height: 21px;
   background-position: 0 0;
   cursor: row-resize;
-  background-image: #{this.getCssFilePath('slider_thumbs.png')};
+  background-image: #url(slider_thumbs.png);
 }
 
 .vslider_thumb:active {
@@ -57,7 +57,7 @@
   position: absolute;
   top: 0; height: 21px; width: 21px;
   cursor: row-resize;
-  background-image: #{this.getCssFilePath('slider_thumbs.png')};
+  background-image: #url(slider_thumbs.png);
 }
 
 .vslider_thumb_e,

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

@@ -6,7 +6,7 @@
  height: 23px;
  background-position: 0px 0px;
  background-repeat: no-repeat;
- background-image: #{this.getCssFilePath('stepper.png')};
+ background-image: #url(stepper.png);
 }
 
 .disabled .stepper_state {

data/client/js/controls/stringview/stringview.js

@@ -22,19 +22,6 @@ var HStringView, HLabel;
 
     optimizeWidthOnRefresh: true,
 
-  /** = Description
-    * The setStyle method of HStringView applies only to the value
-    * element (not the whole component).
-    *
-    **/
-    setStyle: function(_name, _value, _cacheOverride) {
-      if (!this['markupElemIds']||!this.markupElemIds['value']) {
-        return this;
-      }
-      this.setStyleOfPart( 'value', _name, _value, _cacheOverride);
-      return this;
-    },
-
   /** = Description
     * The refreshLabel of HStringView sets a tool tip.
     * Applied by the setLabel method and the label attribute of options.
@@ -43,23 +30,29 @@ var HStringView, HLabel;
     refreshLabel: function() {
       if(this.markupElemIds && this.markupElemIds.value) {
         if( this.value !== undefined ){
-          this.setAttrOfPart( 'value', 'title', this.label );
+          this.setAttr( 'title', this.label );
         }
         else {
-          this.setMarkupOfPart( 'value', this.label );
+          this.setHTML( this.label );
         }
       }
     },
 
     labelPadding: 0,
     optimizeWidth: function(){
-      var _labelWidth = this.stringWidth((this.value || this.label),null,this.markupElemIds.value);
+      var _labelWidth = this.stringWidth((this.value || this.label));
       _labelWidth += this.labelPadding;
       if( this.rect.width !== _labelWidth ){
         this.rect.setWidth(_labelWidth);
         this.drawRect();
       }
+    },
+
+    extDraw: function(){
+      this.markupElemIds.value = this.elemId;
+      if(this.options.noWrap){this.setCSSClass( 'nowrap' );}
     }
+
   };
 
   HLabel = HView.extend( _HStringViewInterface );

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

@@ -1,8 +1,16 @@
-.stringview {
+.default.stringview {
   color: #333;
   padding: 1px;
   font-size: 12px;
   font-family: Helvetica, Arial, sans-serif;
   overflow-y: visible;
+  text-align: left;
+}
+.default.stringview.nowrap {
+  white-space: nowrap;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+}
+.default.disabled.stringview {
+  color: #666;
 }
-

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

@@ -17,7 +17,7 @@
 .tab_label .tablabel,
 .tab_label_fill_bg {
   background-repeat: no-repeat;
-  background-image: #{this.getCssFilePath('tab_parts1.png')};
+  background-image: #url(tab_parts1.png);
 }
 .tab_label_fill_bg {
   position: absolute;
@@ -68,11 +68,11 @@
   position: absolute;
   top: 24px; left: 0; right: 0; bottom: 0;
   border-radius: 0 0 3px 3px;
-  background-image: #{this.getCssFilePath('tab_border_pattern.png')};
+  background-image: #url(tab_border_pattern.png);
 }
 .tab_fg {
   position: absolute;
   top: 0; left: 1px; right: 1px; bottom: 1px;
   border-radius: 0 0 3px 3px;
-  background-image: #{this.getCssFilePath('tab_bg_color.png')};
+  background-image: #url(tab_bg_color.png);
 }

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

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