rsence-pre 2.2.0.38 → 2.2.2.0

data/js/controls/window/themes/default/window.css

@@ -29,7 +29,7 @@
 .window_titlebar {
   opacity: 0.97;
 }
-.inactive .window_titlebar {
+.inactive > .window_titlebar {
   opacity: 0.95;
 }
 
@@ -41,18 +41,18 @@
   box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
 }
 
-.inactive .window_shadow {
+.inactive > .window_shadow {
   -moz-box-shadow: 3px 3px 13px #333;
   -webkit-box-shadow: 3px 3px 13px #333;
   box-shadow: 3px 3px 13px #333;
 }
 
-.window_controls * {
+.window_controls {
   cursor: pointer;
 }
 
 .window_titlebar {
-  left: 0px; top: 0px; height: 24px; min-width: 96px; right: 0px;
+  left: 0; top: 0; height: 24px; min-width: 96px; right: 0;
 }
 
 .window_titlebar * {
@@ -60,33 +60,33 @@
 }
 
 .window_titlebar_edge_left {
-  left: 0px; top: 0px; width: 24px; height: 24px;
-  background-position: 0px 0px;
+  left: 0; top: 0; width: 24px; height: 24px;
+  background-position: 0 0;
 }
 
-.inactive .window_titlebar_edge_left {
-  background-position: 0px -48px;
+.inactive > .window_titlebar > .window_titlebar_edge_left {
+  background-position: 0 -48px;
 }
 
 .window_titlebar_edge_right {
-  right: 0px; top: 0px; width: 24px; height: 24px;
-  background-position: -24px 0px;
+  right: 0; top: 0; width: 24px; height: 24px;
+  background-position: -24px 0;
 }
 
-.inactive .window_titlebar_edge_right {
-  right: 0px; top: 0px; width: 24px; height: 24px;
+.inactive > .window_titlebar > .window_titlebar_edge_right {
+  right: 0; top: 0; width: 24px; height: 24px;
   background-position: -24px -48px;
 }
 
 .window_titlebar_center {
-  left: 24px; top: 0px; right: 24px; height: 24px;
-  background-position: 0px 0px;
+  left: 24px; top: 0; right: 24px; height: 24px;
+  background-position: 0 0;
   background-repeat: repeat-x;
   background-image: #{this.getCssFilePath('window_parts2.png')};
 }
 
-.inactive .window_titlebar_center {
-  background-position: 0px -48px;
+.inactive > .window_titlebar > .window_titlebar_center {
+  background-position: 0 -48px;
 }
 
 .window_bg {
@@ -95,12 +95,12 @@
   background-image: #{this.getCssFilePath('window_bg_active.png')};
 }
 
-.inactive .window_bg {
+.inactive > .window_bg {
   background-image: #{this.getCssFilePath('window_bg_inactive.png')};
 }
 
 .window_body {
-  left: 0px; top: 24px; right: 0px; bottom: 0px;
+  left: 0; top: 24px; right: 0; bottom: 0;
 }
 
 .window_body * {
@@ -108,55 +108,55 @@
 }
 
 .window_body_edge_left {
-  left: 0px; top: 0px; bottom: 24px; width: 24px;
+  left: 0; top: 0; bottom: 24px; width: 24px;
   background-repeat: repeat-y;
-  background-position: -72px 0px;
+  background-position: -72px 0;
 }
 
-.inactive .window_body_edge_left {
-  background-position: -120px 0px;
+.inactive > .window_body > .window_body_edge_left {
+  background-position: -120px 0;
 }
 
 .window_body_edge_right {
-  right: 0px; top: 0px; bottom: 24px; width: 24px;
+  right: 0; top: 0; bottom: 24px; width: 24px;
   background-repeat: repeat-y;
-  background-position: -96px 0px;
+  background-position: -96px 0;
 }
 
-.inactive .window_body_edge_right {
-  background-position: -144px 0px;
+.inactive > .window_body > .window_body_edge_right {
+  background-position: -144px 0;
 }
 
 .window_body_corner_left {
-  left: 0px; bottom: 0px; height: 24px; width: 24px;
-  background-position: 0px -24px;
+  left: 0; bottom: 0; height: 24px; width: 24px;
+  background-position: 0 -24px;
 }
-.inactive .window_body_corner_left {
-  background-position: 0px -72px;
+.inactive > .window_body > .window_body_corner_left {
+  background-position: 0 -72px;
 }
 
 .window_body_corner_right {
-  right: 0px; bottom: 0px; height: 24px; width: 24px;
+  right: 0; bottom: 0; height: 24px; width: 24px;
   background-position: -24px -24px;
 }
 
-.inactive .window_body_corner_right {
+.inactive > .window_body > .window_body_corner_right {
   background-position: -24px -72px;
 }
 
 .window_body_edge_bottom {
-  left: 24px; bottom: 0px; right: 24px; height: 24px;
+  left: 24px; bottom: 0; right: 24px; height: 24px;
   background-repeat: repeat-x;
-  background-position: 0px -24px;
+  background-position: 0 -24px;
   background-image: #{this.getCssFilePath('window_parts2.png')};
 }
 
-.inactive .window_body_edge_bottom {
-  background-position: 0px -72px;
+.inactive > .window_body > .window_body_edge_bottom {
+  background-position: 0 -72px;
 }
 
 .window_label {
-  left: 0px; top: 0px; right: 0px; height: 24px;
+  left: 0; top: 0; right: 0; height: 24px;
   line-height: 26px;
   text-align: center;
   vertical-align: middle;
@@ -166,29 +166,29 @@
   color: #000;
 }
 
-.inactive .window_label {
+.inactive > .window_label {
   color: #666;
 }
 
 .window_controls {
-  left: 0px; top: 0px; right: 0px; bottom: 0px;
+  left: 0; top: 0; right: 0; bottom: 0;
 }
 
 .window_subview {
-  left: 2px; top: 26px; right: 2px; bottom: 2px;
+  left: 2px; top: 24px; right: 2px; bottom: 2px;
 }
 
 .window_resize_se {
   position: absolute;
-  right: 0px; bottom: 0px; width: 13px; height: 13px;
+  right: 0; bottom: 0; width: 13px; height: 13px;
   cursor: se-resize;
   z-index: 10000;
   background-position: -59px -35px;
-  font-size: 0px;
+  font-size: 0;
   background-image: #{this.getCssFilePath('window_parts1.png')};
 }
 
-.inactive .window_resize_se {
+.inactive > .window_resize_se {
   background-position: -59px -83px;
 }
 
@@ -201,42 +201,54 @@
 
 .window_controls_close {
   #{BROWSER_TYPE.mac?'left':'right'}: 8px;
-  background-position: 0px 0px;
+  background-position: 0 0;
+}
+
+.window_controls_close.disable_close {
+  opacity: 0.3;
 }
 
-.window_controls:hover .window_controls_close {
-  background-position: 0px -15px;
+.window_controls:hover .window_controls_close.enable_close {
+  background-position: 0 -15px;
 }
 
-.window_controls:hover .window_controls_close:active {
-  background-position: 0px -30px;
+.window_controls:hover .window_controls_close:active.enable_close {
+  background-position: 0 -30px;
 }
 
 
 .window_controls_collapse {
   #{BROWSER_TYPE.mac?'left: 27px':'right: 46px'};
-  background-position: -30px 0px;
+  background-position: -30px 0;
 }
 
-.window_controls:hover .window_controls_collapse {
+.window_controls_collapse.disable_collapse {
+  opacity: 0.3;
+}
+
+.window_controls:hover .window_controls_collapse.enable_collapse {
   background-position: -30px -15px;
 }
 
-.window_controls:hover .window_controls_collapse:active {
+.window_controls:hover .window_controls_collapse:active.enable_collapse {
   background-position: -30px -30px;
 }
 
 
 .window_controls_zoom {
   #{BROWSER_TYPE.mac?'left: 46px':'right: 27px'};
-  background-position: -15px 0px;
+  background-position: -15px 0;
+}
+
+.window_controls_zoom.disable_zoom {
+  opacity: 0.3;
 }
 
-.window_controls:hover .window_controls_zoom {
+.window_controls:hover .window_controls_zoom.enable_zoom {
   background-position: -15px -15px;
 }
 
-.window_controls:hover .window_controls_zoom:active {
+.window_controls:hover .window_controls_zoom:active.enable_zoom  {
   background-position: -15px -30px;
 }
 

data/js/controls/window/themes/default/window.html

@@ -14,6 +14,10 @@ ${this.setStyle('overflow','visible')}
   <div class="window_body_corner_right"></div>
 </div>
 <div class="window_label" id="label#{_ID}">#{this.label}</div>
-<div class="window_controls" id="control#{_ID}">#{this.options.closeButton?'<div class="window_controls_close" onclick="HSystem.views['+this.viewId+'].windowClose();"></div>':''}#{this.options.collapseButton?'<div class="window_controls_collapse" onclick="HSystem.views['+this.viewId+'].windowCollapse();"></div>':''}#{this.options.zoomButton?'<div class="window_controls_zoom" onclick="HSystem.views['+this.viewId+'].windowZoom();"></div>':''}</div>
+<div class="window_controls" id="control#{_ID}">
+  <div class="window_controls_close" id="close#{_ID}"></div>
+  <div class="window_controls_collapse" id="collapse#{_ID}"></div>
+  <div class="window_controls_zoom" id="zoom#{_ID}"></div>
+</div>
 <div class="window_subview" id="subview#{_ID}"></div>
-#{this.options.noResize?'':'<div class="window_resize_se"></div>'}
+<div class="window_resize_se" id="resize#{_ID}"></div>

data/js/controls/window/window.js

@@ -51,7 +51,7 @@ HWindow = HDynControl.extend({
   * +resizeSE+::  The size of the south-east (right bottom) resizable corner.
   *               Defaults to +[ 16, 16 ]+
   * +noResize+::  A flag (when true) disables all resizing and only allows
-  *               moving.
+  *               moving. Does not disable the (-) and (+) buttons.
   * +fullWindowMove+:: A flag (when true) enables the full HWindow area 
   *                    responds to drag events. By default it's false,
   *                    meaning only the title bar is draggable.
@@ -64,12 +64,15 @@ HWindow = HDynControl.extend({
   *                    disabled. When enabled, extend the 
   *                    HWindow#windowCollapse method, which by default
   *                    zooms the window to its +minSize+.
+  * +minimizeButton+:: An alias for +collapseButton+
   * +zoomButton+:: A flag (when true) enables the zoom (or maximize)
   *                button of the HWindow instance. By default it's
   *                disabled. When enabled, extend the 
   *                HWindow#windowZoom method, which by default zooms the
   *                contents of the HWindow to fit or the +maxSize+ depending
   *                on which is smaller.
+  * +resizeButton+:: An alias for +zoomButton+
+  * +maximizeButton+:: An alias for +zoomButton+
   *
   **/
   controlDefaults: (HDynControl.prototype.controlDefaults.extend({
@@ -104,7 +107,7 @@ HWindow = HDynControl.extend({
         this.resizeSW = [ 6, 6 ];
       }
       if(!this.resizeSE){
-        this.resizeSE = [ 16, 16 ];
+        this.resizeSE = [ 25, 25 ];
       }
     },
     maxX: 'auto',
@@ -117,7 +120,10 @@ HWindow = HDynControl.extend({
     fullWindowMove: false,
     closeButton: false,
     collapseButton: false,
-    zoomButton: false
+    minimizeButton: false,
+    zoomButton: false,
+    resizeButton: false,
+    maximizeButton: false
   })),
   
   draw: function(){
@@ -127,6 +133,61 @@ HWindow = HDynControl.extend({
       HSystem.windowFocus(this);
     }
   },
+
+  markupElemNames: [
+    'label', 'control', 'subview', 'close', 'collapse', 'zoom', 'resize'
+  ],
+
+  refreshWidgetStates: function(){
+    if(!this.drawn){ return; }
+    var
+    _this = this,
+    _opts = _this.options,
+    _elemId, _elem,
+    // _elemId = _this.markupElemIds.zoom,
+    // _elem = ELEM.get(_elemId),
+    _enablePrefix = 'enable_', _disablePrefix = 'disable_',
+    _listenEvent = 'click',
+    _addClass, _delClass,
+    _widgets = [
+      [ 'zoom', (_this.enabled && (_opts.zoomButton || _opts.maximizeButton || _opts.resizeButton)), function(){_this.windowZoom();} ],
+      [ 'collapse', (_this.enabled && (_opts.collapseButton || _opts.minimizeButton)), function(){_this.windowCollapse();} ],
+      [ 'close', (_this.enabled && _opts.closeButton), function(){_this.windowClose();} ]
+    ],
+    _elemName, _enabled, _callback,
+    _item, i = 0;
+    for(;i<_widgets.length;i++){
+      _item = _widgets[i];
+      _elemName = _item[0];
+      _enabled = _item[1];
+      _callback = _item[2];
+      _elemId = _this.markupElemIds[_elemName];
+      _elem = ELEM.get(_elemId);
+      Event.stopObserving( _elem, _listenEvent, _callback );
+      if(_enabled){
+        Event.observe( _elem, _listenEvent, _callback );
+        _addClass = _enablePrefix+_elemName;
+        _delClass = _disablePrefix+_elemName;
+      }
+      else {
+        _delClass = _enablePrefix+_elemName;
+        _addClass = _disablePrefix+_elemName;
+      }
+      ELEM.addClassName( _elemId, _addClass );
+      ELEM.delClassName( _elemId, _delClass );
+    }
+    _this.setStyleOfPart('resize','visibility',(_opts.noResize?'hidden':'inherit'));
+  },
+
+  drawSubviews: function(){
+    this.base();
+    this.refreshWidgetStates();
+  },
+
+  setEnabled: function(_state){
+    this.base(_state);
+    this.refreshWidgetStates();
+  },
   
   // -- overrides the drag rules to adapt to the !fullWindowMove as well
   // as disabling draggability in window button areas. ++
@@ -143,10 +204,10 @@ HWindow = HDynControl.extend({
         _opts = _this.options,
         _leftPx=_opts.resizeW;
     if(!_opts.fullWindowMove){
-      if(_opts.zoomButton){
+      if(_opts.zoomButton || _opts.maximizeButton || _opts.resizeButton){
         _leftPx = 61;
       }
-      else if(_opts.collapseButton){
+      else if(_opts.collapseButton || _opts.minimizeButton){
         _leftPx = 46;
       }
       else if(_opts.closeButton){
@@ -158,18 +219,18 @@ HWindow = HDynControl.extend({
   },
   
   maxRect: function(){
-    var _rect = this.base();
-    if(_rect[2]<this.options.minSize[0]){
-      _rect[2] = this.options.minSize[0];
+    var _rect = this.base(), _opts = this.options;
+    if(_rect[2]<_opts.minSize[0]){
+      _rect[2] = _opts.minSize[0];
     }
-    else if(_rect[2]>this.options.maxSize[0]){
-      _rect[2] = this.options.maxSize[0];
+    else if(_rect[2]>_opts.maxSize[0]){
+      _rect[2] = _opts.maxSize[0];
     }
-    if(_rect[3]<this.options.minSize[1]){
-      _rect[3] = this.options.minSize[1];
+    if(_rect[3]<_opts.minSize[1]){
+      _rect[3] = _opts.minSize[1];
     }
-    else if(_rect[3]>this.options.maxSize[1]){
-      _rect[3] = this.options.maxSize[1];
+    else if(_rect[3]>_opts.maxSize[1]){
+      _rect[3] = _opts.maxSize[1];
     }
     return _rect;
   },
@@ -204,44 +265,74 @@ HWindow = HDynControl.extend({
   windowClose: function(){
     this.die(); // extend this to this.app.die(), if your app needs to die instead of just the window
   },
+
+  setLabel: function(_label){
+    this.base(_label);
+    var
+    _labelWidth = 128 + _win.stringWidth( _win.label );
+    if(this._origMinWidth === undefined){
+      this._origMinWidth = this.options.minSize[0];
+    }
+    if(this._origMinWidth<_labelWidth){
+      this.options.minSize[0] = _labelWidth;
+    }
+    else{
+      this.options.minSize[0] = this._origMinWidth;
+    }
+    this.makeRectRules();
+  },
   
 /** This method gets called, whenever the collapse (minimize) button has 
   * been clicked
   **/
-  windowCollapse: function(){
-    if(this.options.collapseUsing){
-      this.options.collapseUsing( this );
+  windowCollapse: function(_rectOnly){
+    var
+    _win = this, _opts = _win.options;
+    if(HSystem.globalCollapseHandler && !_rectOnly && HSystem.globalCollapseHandler( _win )){
+      return;
+    }
+    if(_opts.collapseUsing && !_rectOnly){
+      _opts.collapseUsing( this );
     }
     else {
-      var _minRect = HRect.nu(
-        this.rect.leftTop,
-        this.rect.leftTop.subtract(
-          0-this.options.minSize[0],
-          0-this.options.minSize[1]
+      var
+      _labelSize = 128 + _win.stringWidth( _win.label ),
+      _minWidth = (_opts.minSize[1] > _labelSize)?_opts.minSize[0]:_labelSize,
+      _minRect = HRect.nu(
+        _win.rect.leftTop,
+        _win.rect.leftTop.subtract(
+          0-_minWidth,
+          0-_opts.minSize[1]
         )
       );
-      if(!this.rect.equals(_minRect)){
-        this.prevRect = HRect.nu(_minRect);
-        this.animateTo( _minRect );
+      if(_rectOnly){
+        return _minRect;
+      }
+      if(!_win.rect.equals(_minRect)){
+        _win.prevRect = HRect.nu(_minRect);
+        _win.animateTo( _minRect );
       }
     }
+    this.makeRectRules();
   },
   
 /** This method gets called, whenever the zoom (maximize/restore) 
   * button has been clicked
   **/
   windowZoom: function(){
-    var _maxSize = this.options.maxSize === 'auto' ? this.parentSize() : this.options.maxSize,
-        _maxRect = HRect.nu(
-          this.options.minX,
-          this.options.minY,
-          _maxSize[0],
-          _maxSize[1]
-        ),
-        _fitsRect = HRect.nu( this.rect ),
-        i = 0,
-        _views = this.views,
-        _view, _size, _right, _bottom;
+    var
+    _maxSize = this.options.maxSize === 'auto' ? this.parentSize() : this.options.maxSize,
+    _maxRect = HRect.nu(
+      this.options.minX,
+      this.options.minY,
+      _maxSize[0],
+      _maxSize[1]
+    ),
+    _fitsRect = HRect.nu( this.rect ),
+    _newRect,
+    i = 0,
+    _views = this.views,
+    _view, _size, _right, _bottom;
     for( ; i < _views.length; i++ ){
       _view = HSystem.views[_views[i]];
       _size = ELEM.getSize(_view.elemId);
@@ -267,22 +358,58 @@ HWindow = HDynControl.extend({
     else if(_fitsRect.height < this.options.minSize[1]){
       _fitsRect.setHeight( this.options.minSize[1] );
     }
+    // doesn't fit or right-clicked or alt-clicked, maximize:
     if (!_fitsRect.equals(_maxRect) && (EVENT.status[ EVENT.button2 ] || EVENT.status[ EVENT.altKeyDown ]) ){
+      // console.log('force-max');
       this.animateTo( _maxRect );
       this.prevRect = HRect.nu( this.rect );
       this.animateTo( _maxRect );
     }
-    else if(this.rect.equals(_fitsRect)){
-      if(this.prevRect !== undefined && !this.prevRect.equals(_fitsRect)){
-        this.animateTo( HRect.nu(this.prevRect) );
+    // already fits content
+    else if(this.rect.contains(_fitsRect)){
+      // restore previous
+      if(this.prevRect && !this.prevRect.equals(_fitsRect) && !this.prevRect.equals(this.windowCollapse(true))){
+        // restore previous size and position:
+        if( this.rect.equals( _maxRect ) ){
+          // console.log('restore');
+          this.animateTo( HRect.nu(this.prevRect) );
+          // this.prevRect = HRect.nu( this.rect );
+        }
+        else if( this.prevRect.equals( this.rect ) && !this.prevRect.equals(_fitsRect) ){
+          // console.log('smart-down');
+          this.animateTo( _fitsRect );
+          // this.prevRect = HRect.nu( this.rect );
+        }
+        else if( this.prevRect.equals( this.rect ) && this.prevRect.equals(_fitsRect) ){
+          // console.log('smart-max');
+          this.animateTo( _maxRect );
+          this.prevRect = HRect.nu( this.rect );
+        }
+        else{
+          // console.log('prev-size');
+          _newRect = HRect.nu( this.prevRect );
+          _newRect.offsetTo(this.rect.leftTop);
+          this.animateTo( _newRect );
+          this.prevRect = HRect.nu( _newRect );
+        }
+      }
+      // restore previous size only:
+      else if( this.rect.equals( _fitsRect ) && this.prevRect && !this.prevRect.equals(this.rect) ){
+        // console.log('restore-smart');
+        this.animateTo( this.prevRect );
+        // this.prevRect = HRect.nu( this.rect );
       }
+      // maximize
       else {
+        // console.log('max');
         this.prevRect = HRect.nu( this.rect );
         this.animateTo( _maxRect );
       }
     }
+    // smart-resize to fit content:
     else {
-      this.prevRect = HRect.nu(_fitsRect);
+      // console.log('smart-up');
+      // this.prevRect = HRect.nu(_fitsRect);
       this.animateTo( _fitsRect );
     }
   }

data/js/core/class/class.js

@@ -66,6 +66,9 @@ HClass = function() {
 
 
 HClass.prototype = {
+
+  // detection for production build (compressed source; '_compressed' would be something like '_x4', whereas '_'+'compressed' is still '_compressed')
+  isProduction: '_'+'compressed' !== '_compressed',
   
  /* The property copying method. */
   extend: function(_source, _value) {
@@ -313,6 +316,13 @@ if ([]['indexOf']===undefined) {
   };
 }
 
+// String fix
+if(typeof String.prototype.trim !== 'function') {
+  String.prototype.trim = function() {
+    return this.replace(/^\s+|\s+$/g, '');
+  };
+}
+
 // ff version 3.0.3 fails on this, when firebug installed: try/catch block
 try {