uki 1.0.0 → 1.0.1

data/frameworks/uki/src/uki-view/view/scrollPane.js

@@ -36,11 +36,13 @@
                 _scrollableV: true,
                 _scrollableH: false,
                 _scrollV: false,
-                _scrollH: false
+                _scrollH: false,
+                _sbV: false,
+                _sbH: false
             });
         };
     
-        uki.addProps(this, ['scrollableV', 'scrollableH']);
+        uki.addProps(this, ['scrollableV', 'scrollableH', 'scrollH', 'scrollV']);
     
         this.rectForChild = function() { return this._rectForChild; };
         this.clientRect = function() { return this._clientRect; };
@@ -56,8 +58,14 @@
             };
         }, this);
     
-        uki.delegateProp(this, 'scrollTop', '_dom');
-        uki.delegateProp(this, 'scrollLeft', '_dom');
+        uki.each(['scrollTop', 'scrollLeft'], function(i, name) {
+            this[name] = function(v) {
+                if (v == undefined) return this._dom[name];
+                this._dom[name] = v;
+                this.trigger('scroll', { source: this });
+                return this;
+            };
+        }, this);
     
         this.visibleRect = function() {
             var tmpRect = this._clientRect.clone();
@@ -87,8 +95,8 @@
                 sh = this._scrollableH ? cw > this._rect.width : false,
                 sv = this._scrollableV ? ch > this._rect.height : false;
             
-            this._scrollH = sh;
-            this._scrollV = sv;
+            this._sbH = sh || this._scrollH;
+            this._sbV = sv || this._scrollV;
             this._clientRect = new Rect( this._rect.width +  (sv ? -1 : 0) * scrollWidth,
                                          this._rect.height + (sh ? -1 : 0) * scrollWidth );
             this._rectForChild = new Rect( this._rect.width +  (sv && !widthIncludesScrollBar ? -1 : 0) * scrollWidth,
@@ -121,14 +129,14 @@
         this._layoutDom = function(rect) {
             this._updateClientRects();
         
-            if (this._layoutScrollH !== this._scrollH) {
-                this._dom.style.overflowX = this._scrollH ? 'scroll' : 'hidden';
-                this._layoutScrollH = this._scrollH;
+            if (this._layoutScrollH !== this._sbH) {
+                this._dom.style.overflowX = this._sbH ? 'scroll' : 'hidden';
+                this._layoutScrollH = this._sbH;
             }
 
-            if (this._layoutScrollV !== this._scrollV) {
-                this._dom.style.overflowY = this._scrollV ? 'scroll' : 'hidden';
-                this._layoutScrollV = this._scrollV;
+            if (this._layoutScrollV !== this._sbV) {
+                this._dom.style.overflowY = this._sbV ? 'scroll' : 'hidden';
+                this._layoutScrollV = this._sbV;
             }
         
             Base._layoutDom.call(this, rect);

data/frameworks/uki/src/uki-view/view/table/column.js

@@ -1,96 +1,118 @@
 uki.view.table.Column = uki.newClass(uki.view.Observable, new function() {
-    var proto = this;
-    
-    proto._width = 100;
-    proto._offset = 0;
-    proto._position = 0;
-    proto._minWidth = 40;
-    proto._css = 'overflow:hidden;float:left;font-size:11px;line-height:11px;white-space:nowrap;text-overflow:ellipsis;';
-    proto._inset = new Inset(3, 5);
+    this._width = 100;
+    this._offset = 0;
+    this._position = 0;
+    this._minWidth = 0;
+    this._maxWidth = 0;
+    this._css = 'float:left;white-space:nowrap;text-overflow:ellipsis;';
+    this._inset = new Inset(3, 5);
 
-    proto.init = function() {};
+    this.init = function() {};
+    
+    uki.addProps(this, ['position', 'css', 'formatter', 'label', 'resizable', 'maxWidth', 'minWidth', 'maxWidth']);
     
-    uki.addProps(proto, ['position', 'css', 'formatter', 'label', 'resizable', 'maxWidth', 'minWidth']);
+    this.template = function(v) {
+        if (v === undefined) return this._template = this._template || uki.theme.template('table-cell');
+        this._template = v;
+        return this;
+    };
+    
+    this.headerTemplate = function(v) {
+        if (v === undefined) return this._headerTemplate = this._headerTemplate || uki.theme.template('table-header-cell');
+        this._headerTemplate = v;
+        return this;
+    };
     
     /**
      * @fires event:beforeResize
      * @fires event:resize
      */
-    proto.width = uki.newProp('_width', function(w) {
+    this.width = uki.newProp('_width', function(w) {
+        var e = {
+            oldWidth: this._width,
+            source: this
+        };
         this._width = this._normailizeWidth(w);
-        this.trigger('beforeResize', {source: this});
-        if (this._stylesheet) {
+        e.newWidth = this._width;
+        this.trigger('beforeResize', e);
+        if (this._stylesheet && e.newWidth != e.oldWidth) {
             var rules = this._stylesheet.styleSheet ? this._stylesheet.styleSheet.rules : this._stylesheet.sheet.cssRules;
             rules[0].style.width = this._clientWidth() + PX;
         }
-        this.trigger('resize', {source: this});
+        this.trigger('resize', e);
     });
     
-    proto._bindToDom = uki.F;
+    this._bindToDom = uki.F;
     
-    proto._normailizeWidth = function(w) {
+    this._normailizeWidth = function(w) {
         if (this._maxWidth) w = MIN(this._maxWidth, w);
         if (this._minWidth) w = MAX(this._minWidth, w);
         return w;
     };
     
-    proto.inset = uki.newProp('_inset', function(i) {
+    this.inset = uki.newProp('_inset', function(i) {
         this._inset = Inset.create(i);
     });
     
-    proto.render = function(row, rect, i) {
-        if (!this._template) this._template = this._buildTemplate(rect);
-        this._template[1] = this._formatter ? this._formatter(row[this._position], row) : row[this._position];
-        return this._template.join('')
+    this.render = function(row, rect, i) {
+        this._prerenderedTemplate || this._prerenderTemplate(rect);
+        this._prerenderedTemplate[1] = this._formatter ? this._formatter(row[this._position], row) : row[this._position];
+        return this._prerenderedTemplate.join('');
+    };
+    
+    this.appendResizer = function(dom, height) {
+        var resizer = uki.theme.dom('resizer', height);
+        dom.appendChild(resizer);
+        return resizer;
+    };
+    
+    this.renderHeader = function(height) {
+        this._className || this._initStylesheet();
+        var x = this.headerTemplate().render({
+            data: '<div style="overflow:hidden;text-overflow:ellipsis;">' + this.label() + '</div>',
+            style: this._cellStyle(uki.dom.offset.boxModel ? height - 1 : height),
+            className: this._className
+        });
+        return x;
     };
     
-    proto.renderHeader = function(height) {
-        if (!this._headerTemplate) this._headerTemplate = this._buildHeaderTemplate(height);
-        var template = this._headerTemplate;
-        template[1] = this.label();
-        return template.join('');
+    this._prerenderTemplate = function(rect) {
+        this._className || this._initStylesheet();
+        this._prerenderedTemplate = this.template().render({
+            data: '\u0001\u0001',
+            style: 'overflow:hidden;' + this._cellStyle(rect.height),
+            className: this._className
+        }).split('\u0001');
     };
     
-    proto._clientWidth = function() {
+    this._cellPadding = function() {
+        var inset = this._inset;
+        return ['padding:', inset.top, 'px ', inset.right, 'px ', inset.bottom, 'px ', inset.left, 'px;'].join('');
+    };
+    
+    this._cellStyle = function(height) {
+        var h = 'height:' + (height - (uki.dom.offset.boxModel ? this._inset.height() : 0)) + 'px;';
+        return this._css + this._cellPadding() + ';' + h;
+    };
+    
+    this._clientWidth = function() {
         return this._width - (uki.dom.offset.boxModel ? this._inset.width() + 1 : 0);
     };
     
-    proto._initStylesheet = function() {
-        uki.dom.offset.initializeBoxModel();
+    this._initStylesheet = function() {
         if (!this._className) {
+            uki.dom.offset.initializeBoxModel();
             this._className = 'uki-table-column-' + (++uki.dom.guid);
             var css = '.' + this._className + ' {width:' + this._clientWidth() + 'px;}';
             this._stylesheet = uki.dom.createStylesheet(css);
         }
     };
-    
-    proto._buildHeaderTemplate = function(headerHeight) {
-        this._initStylesheet();
-        var border = 'border:1px solid #CCC;border-top: none;border-left:none;',
-            inset  = this._inset,
-            padding = ['padding:', inset.top, 'px ', inset.right, 'px ', inset.bottom, 'px ', inset.left, 'px;'].join(''),
-            height = 'height:' + (headerHeight - (uki.dom.offset.boxModel ? inset.height() + 1 : 0)) + 'px;',
-            tagOpening = ['<div style="position:relative;', border, padding, height, this._css, '" class="',this._className,'">'].join('');
-        
-        return [tagOpening, '', '</div>'];
-    };
-    
-    proto._buildTemplate = function(rect) {
-        this._initStylesheet();
-        var inset = this._inset,
-            border = 'border-right:1px solid #CCC;',
-            padding = ['padding:', inset.top, 'px ', inset.right, 'px ', inset.bottom, 'px ', inset.left, 'px;'].join(''),
-            height = 'height:' + (rect.height - (uki.dom.offset.boxModel ? inset.height() : 0)) + 'px;',
-            tagOpening = ['<div style="', border, padding, height, this._css, '" class="',this._className,'">'].join('');
-        return [tagOpening, '', '</div>'];
-    };
 });
 
 uki.view.table.NumberColumn = uki.newClass(uki.view.table.Column, new function() {
-    var Base = uki.view.table.Column.prototype,
-        proto = this;
+    var Base = uki.view.table.Column.prototype;
 
-    proto._css = Base._css + 'text-align:right;';
+    this._css = Base._css + 'text-align:right;';
 });
 
 uki.view.table.CustomColumn = uki.view.table.Column;

data/frameworks/uki/src/uki-view/view/table/header.js

@@ -29,10 +29,7 @@ uki.view.table.Header = uki.newClass(uki.view.Label, new function() {
         for (var i=0, column, resizer, offset = 0; i < this._columns.length; i++) {
             column = this._columns[i];
             if (column.resizable()) {
-                resizer = uki.theme.dom('resizer', {height: this.rect().height});
-                resizer.style.right = -2 + PX;
-                // resizer.style.background = 'red';
-                this._label.childNodes[i].appendChild(resizer);
+                var resizer = column.appendResizer(this._label.childNodes[i], this.rect().height);
                 this._bindResizerDrag(resizer, i);
             }
         };

data/frameworks/uki/src/uki-view/view/table/render.js

@@ -1,25 +1,15 @@
 include('../list/render.js');
 
 uki.view.table.Render = uki.newClass(uki.view.list.Render, new function() {
-    
-    var proto = this;
-    
-    proto.init = function(table) {
+    this.init = function(table) {
         this._table = table;
     };
     
-    proto.render = function(row, rect, i) {
-        if (!this._template) this._template = this._buildTemplate(rect);
+    this.render = function(row, rect, i) {
         var table = this._table,
             columns = table.columns();
-        this._template[1] = uki.map(columns, function(val, j) {
+        return uki.map(columns, function(val, j) {
             return columns[j].render(row, rect, i);
         }).join('');
-        return this._template.join('');
-    };
-    
-    proto._buildTemplate = function(rect) {
-        var tagOpening = ['<div style="position:relwidth:100%;height:', rect.height, 'px">'].join(',');
-        return ['', '', '']
     };
 });

data/frameworks/uki/src/uki-view/view/table.js

@@ -12,10 +12,23 @@ uki.view.declare('uki.view.Table', uki.view.Container, function(Base) {
     
     uki.each(propertiesToDelegate, function(i, name) { uki.delegateProp(this, name, '_list'); }, this);
     
+    this._setup = function() {
+        this._columns = [];
+        Base._setup.call(this);
+    };
+    
+    this._style = function(name, value) {
+        this._header.style(name, value);
+        return Base._style.call(this, name, value);
+    };
+    
     this.columns = uki.newProp('_columns', function(c) {
+        for (var i = 0; i < this._columns.length; i++) {
+            this._columns[i].unbind();
+        }
         this._columns = uki.build(c);
         this._totalWidth = 0;
-        for (var i = 0; i < this._columns.length; i++) {
+        for (i = 0; i < this._columns.length; i++) {
             this._columns[i].position(i);
             this._columns[i].bind('beforeResize', uki.proxy(function() {
                 this._updateTotalWidth();
@@ -32,8 +45,8 @@ uki.view.declare('uki.view.Table', uki.view.Container, function(Base) {
             this._columns[i].position(i);
             this._totalWidth += this._columns[i].width();
         };
-        this._list.minSize(new Size(this._totalWidth, 0));
-        this._list.rect(new Rect(this._totalWidth, this._list.height()));
+        this._list.minSize(new Size(this._totalWidth, this._list.minSize().height));
+        // this._list.rect(new Rect(this._totalWidth, this._list.height()));
         this._header.minSize(new Size(this._totalWidth, 0));
     };
     

data/frameworks/uki/src/uki-view/view/toolbar.js

@@ -36,7 +36,7 @@ uki.view.declare('uki.view.Toolbar', uki.view.Container, function(Base) {
             flowML = { view: 'HFlow', rect: flowRect, anchors: 'left top right', className: 'toolbar-flow', hidePartlyVisible: true },
             moreML = { view: 'Button', rect: moreRect, anchors: 'right top', className: 'toolbar-button',  visible: false, backgroundPrefix: 'toolbar-more-', text: '>>', focusable: false },
             popupML = { view: 'Popup', rect: '0 0', anchors: 'right top', className: 'toolbar-popup', background: 'theme(toolbar-popup)', 
-                childViews: { view: 'VFlow', rect: '0 0', anchors: 'right top left bottom' }
+                childViews: { view: 'VFlow', rect: '0 5 0 0', anchors: 'right top left bottom' }
             };
             
         this._flow = uki.build(flowML)[0];
@@ -58,14 +58,14 @@ uki.view.declare('uki.view.Toolbar', uki.view.Container, function(Base) {
             if (currentWidth > maxWith) missing.push(i);
         };
         var newButtons = uki.map(missing, function(i) {
-            var descr = { html: childViews[i].html(), backgroundPrefix: 'toolbar-popup-' };
+            var descr = { html: childViews[i].html(), backgroundPrefix: 'toolbar-popup-button-' };
             uki.each(['fontSize', 'fontWeight', 'color', 'textAlign', 'inset'], function(j, name) {
                 descr[name] = uki.attr(childViews[i], name);
             });
             return this._createButton(descr);
         }, this);
         uki('VFlow', this._popup).childViews(newButtons).resizeToContents('width height');
-        this._popup.resizeToContents('width height').toggle();
+        this._popup.resizeToContents('width height').height(this._popup.height() + 5).toggle();
     };
     
     this._updateMoreVisible = function() {
@@ -85,8 +85,10 @@ uki.view.declare('uki.view.Toolbar', uki.view.Container, function(Base) {
     };
     
     this._createButton = function(descr) {
+        var rect = this.rect().clone().normalize();
+        rect.width = 100;
         return uki.extend({ 
-                view: 'Button', rect: new Rect(100, this.rect().height), focusable: false, align: 'left',
+                view: 'Button', rect: rect, focusable: false, align: 'left',
                 anchors: 'left top', backgroundPrefix: 'toolbar-button-', autosizeToContents: 'width', focusable: false
             }, descr);
     };    

data/templates/view.js.erb

@@ -2,9 +2,9 @@
 
 uki.view.declare('<%= "#{package_name}." if package_name %><%= class_name %>', uki.view.Base, function(Base) {
     
-   this._createDom = function() {
-       Base._createDom.call(this);
-       // add your custom code here
-   }; 
+    this._createDom = function() {
+        Base._createDom.call(this);
+        // add your custom code here
+    }; 
    
 });

data/uki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uki}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-03-22}
+  s.date = %q{2010-03-29}
   s.default_executable = %q{uki}
   s.description = %q{Project creation, dev server, testing, building for uki apps}
   s.email = %q{voloko@gmail.com}
@@ -101,6 +101,7 @@ Gem::Specification.new do |s|
      "frameworks/uki/src/uki-core/view/styleable.js",
      "frameworks/uki/src/uki-core/view/utils.js",
      "frameworks/uki/src/uki-data.js",
+     "frameworks/uki/src/uki-data/ajax.js",
      "frameworks/uki/src/uki-data/data.js",
      "frameworks/uki/src/uki-data/model.js",
      "frameworks/uki/src/uki-data/observable.js",
@@ -109,9 +110,9 @@ Gem::Specification.new do |s|
      "frameworks/uki/src/uki-more/more/utils.js",
      "frameworks/uki/src/uki-more/more/view.js",
      "frameworks/uki/src/uki-more/more/view/listContainer.js",
-     "frameworks/uki/src/uki-more/more/view/multiselectList.js",
      "frameworks/uki/src/uki-more/more/view/radioButton.js",
      "frameworks/uki/src/uki-more/more/view/splitTable.js",
+     "frameworks/uki/src/uki-more/more/view/splitTable/render.js",
      "frameworks/uki/src/uki-more/more/view/toggleButton.js",
      "frameworks/uki/src/uki-more/more/view/treeList.js",
      "frameworks/uki/src/uki-more/more/view/treeList/render.js",
@@ -256,7 +257,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/voloko/uki}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{uki development tools}
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: uki
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -9,39 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +03:00
+date: 2010-03-29 00:00:00 +04:00
 default_executable: uki
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: commander
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 0
+        - 1
         version: 4.0.1
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: jspec
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 3
+        - 2
         version: 3.3.2
-    version: 
+  type: :runtime
+  version_requirements: *id003
 description: Project creation, dev server, testing, building for uki apps
 email: voloko@gmail.com
 executables: 
@@ -134,6 +149,7 @@ files:
 - frameworks/uki/src/uki-core/view/styleable.js
 - frameworks/uki/src/uki-core/view/utils.js
 - frameworks/uki/src/uki-data.js
+- frameworks/uki/src/uki-data/ajax.js
 - frameworks/uki/src/uki-data/data.js
 - frameworks/uki/src/uki-data/model.js
 - frameworks/uki/src/uki-data/observable.js
@@ -142,9 +158,9 @@ files:
 - frameworks/uki/src/uki-more/more/utils.js
 - frameworks/uki/src/uki-more/more/view.js
 - frameworks/uki/src/uki-more/more/view/listContainer.js
-- frameworks/uki/src/uki-more/more/view/multiselectList.js
 - frameworks/uki/src/uki-more/more/view/radioButton.js
 - frameworks/uki/src/uki-more/more/view/splitTable.js
+- frameworks/uki/src/uki-more/more/view/splitTable/render.js
 - frameworks/uki/src/uki-more/more/view/toggleButton.js
 - frameworks/uki/src/uki-more/more/view/treeList.js
 - frameworks/uki/src/uki-more/more/view/treeList/render.js
@@ -298,18 +314,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: uki development tools