uki 1.0.1 → 1.0.2

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

@@ -1,7 +1,5 @@
 uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
-    var proto = this;
-        
-    proto._setup = function() {
+    this._setup = function() {
         Base._setup.call(this);
         this._originalRect = this._rect;
         uki.extend(this, {
@@ -20,13 +18,13 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
     /**
      * @fires event:handleMove
      */
-    proto.handlePosition = uki.newProp('_handlePosition', function(val) {
+    this.handlePosition = uki.newProp('_handlePosition', function(val) {
         this._handlePosition = this._normalizePosition(val);
         this.trigger('handleMove', {source: this, handlePosition: this._handlePosition, dragValue: val });
         this._resizeChildViews();
     });
     
-    proto.handleWidth = uki.newProp('_handleWidth', function(val) {
+    this.handleWidth = uki.newProp('_handleWidth', function(val) {
         if (this._handleWidth != val) {
             this._handleWidth = val;
             var handle = this._createHandle();
@@ -38,7 +36,7 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
     });
     
     
-    proto._normalizePosition = function(val) {
+    this._normalizePosition = function(val) {
         var prop = this._vertical ? 'height' : 'width';
         return MAX(
                 this._leftMin,
@@ -49,15 +47,15 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
     };
     
     
-    uki.addProps(proto, ['leftMin', 'rightMin', 'autogrowLeft', 'autogrowRight']);
-    proto.topMin = proto.leftMin;
-    proto.bottomMin = proto.rightMin;
+    uki.addProps(this, ['leftMin', 'rightMin', 'autogrowLeft', 'autogrowRight']);
+    this.topMin = this.leftMin;
+    this.bottomMin = this.rightMin;
     
-    proto._removeHandle = function() {
+    this._removeHandle = function() {
         this._dom.removeChild(this._handle);
     };
     
-    proto._createHandle = function() {
+    this._createHandle = function() {
         var handle;
         if (this._vertical) {
             handle = uki.theme.dom('splitPane-vertical', {handleWidth: this._handleWidth});
@@ -74,7 +72,7 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
         return handle;
     };
     
-    proto._createDom = function() {
+    this._createDom = function() {
         this._dom = uki.createElement('div', Base.defaultCss);
         for (var i=0, paneML; i < 2; i++) {
             paneML = { view: 'Container' };
@@ -88,7 +86,7 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
         this._dom.appendChild(this._handle = this._createHandle());
     };
     
-    proto._normalizeRect = function(rect) {
+    this._normalizeRect = function(rect) {
         rect = Base._normalizeRect.call(this, rect);
         var newRect = rect.clone();
         if (this._vertical) {
@@ -99,7 +97,7 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
         return newRect;
     };
     
-    proto._resizeSelf = function(newRect) {
+    this._resizeSelf = function(newRect) {
         var oldRect = this._rect,
             dx, prop = this._vertical ? 'height' : 'width';
         if (!Base._resizeSelf.call(this, newRect)) return false;
@@ -119,51 +117,50 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
         return true;
     };
     
-    proto._draggesturestart = function(e) {
+    this._draggesturestart = function(e) {
         var offset = uki.dom.offset(this.dom());
         this._posWithinHandle = (e[this._vertical ? 'pageY' : 'pageX'] - offset[this._vertical ? 'y' : 'x']) - this._handlePosition;
         return true;
     };
     
-    proto._draggesture = function(e) {
+    this._draggesture = function(e) {
         var offset = uki.dom.offset(this.dom());
         this.handlePosition(e[this._vertical ? 'pageY' : 'pageX'] - offset[this._vertical ? 'y' : 'x'] - this._posWithinHandle);
-        e.preventDefault();
         this.layout();
     };
     
-    proto._draggestureend = function(e, offset) {
+    this._draggestureend = function(e, offset) {
     };
     
-    proto.topPane = proto.leftPane = function(pane) {
+    this.topPane = this.leftPane = function(pane) {
         return this._paneAt(0, pane);
     };
     
-    proto.bottomPane = proto.rightPane = function(pane) {
+    this.bottomPane = this.rightPane = function(pane) {
         return this._paneAt(1, pane);
     };
     
-    proto.topChildViews = proto.leftChildViews = function(views) {
+    this.topChildViews = this.leftChildViews = function(views) {
         return this._childViewsAt(0, views);
     };
     
-    proto.bottomChildViews = proto.rightChildViews = function(views) {
+    this.bottomChildViews = this.rightChildViews = function(views) {
         return this._childViewsAt(1, views);
     };
     
-    proto._childViewsAt = function(i, views) {
+    this._childViewsAt = function(i, views) {
         if (views === undefined) return this._panes[i].childViews();
         this._panes[i].childViews(views);
         return this;
     };
     
-    proto._paneAt = function(i, pane) {
+    this._paneAt = function(i, pane) {
         if (pane === undefined) return this._panes[i];
         uki.build.copyAttrs(this._panes[i], pane);
         return this;
     };
     
-    proto._leftRect = function() {
+    this._leftRect = function() {
         if (this._vertical) {
             return new Rect(this._rect.width, this._handlePosition);
         } else {
@@ -171,7 +168,7 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
         }
     };
     
-    proto._rightRect = function() {
+    this._rightRect = function() {
         if (this._vertical) {
             return new Rect(
                 0, this._handlePosition + this._handleWidth,
@@ -185,17 +182,17 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
         }
     };
     
-    proto._resizeChildViews = function() {
+    this._resizeChildViews = function() {
         this._panes[0].rect(this._leftRect());
         this._panes[1].rect(this._rightRect());
     };
     
-    proto._layoutDom = function(rect) {
+    this._layoutDom = function(rect) {
         Base._layoutDom.call(this, rect);
         this._handle.style[this._vertical ? 'top' : 'left'] = this._handlePosition + 'px';
     };
     
-    proto._bindToDom = function(name) {
+    this._bindToDom = function(name) {
         if (name == 'handleMove') return true;
         return Base._bindToDom.call(this, name);
     };

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

@@ -9,7 +9,7 @@ uki.view.table.Column = uki.newClass(uki.view.Observable, new function() {
 
     this.init = function() {};
     
-    uki.addProps(this, ['position', 'css', 'formatter', 'label', 'resizable', 'maxWidth', 'minWidth', 'maxWidth']);
+    uki.addProps(this, ['position', 'css', 'formatter', 'label', 'resizable', 'maxWidth', 'minWidth', 'maxWidth', 'key']);
     
     this.template = function(v) {
         if (v === undefined) return this._template = this._template || uki.theme.template('table-cell');
@@ -56,7 +56,8 @@ uki.view.table.Column = uki.newClass(uki.view.Observable, new function() {
     
     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];
+        var value = this._key ? uki.attr(row, this._key) : row[this._position];
+        this._prerenderedTemplate[1] = this._formatter ? this._formatter(value, row) : value;
         return this._prerenderedTemplate.join('');
     };
     
@@ -69,8 +70,8 @@ uki.view.table.Column = uki.newClass(uki.view.Observable, new function() {
     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),
+            data: '<div style="overflow:hidden;text-overflow:ellipsis;*width:100%;height:100%;">' + this.label() + '</div>',
+            style: '*overflow-y:hidden;' + this._cellStyle(uki.dom.offset.boxModel ? height - 1 : height),
             className: this._className
         });
         return x;
@@ -102,7 +103,7 @@ uki.view.table.Column = uki.newClass(uki.view.Observable, new function() {
     this._initStylesheet = function() {
         if (!this._className) {
             uki.dom.offset.initializeBoxModel();
-            this._className = 'uki-table-column-' + (++uki.dom.guid);
+            this._className = 'uki-table-column-' + (uki.guid++);
             var css = '.' + this._className + ' {width:' + this._clientWidth() + 'px;}';
             this._stylesheet = uki.dom.createStylesheet(css);
         }

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

@@ -1,23 +1,31 @@
 include('../label.js');
 
-uki.view.table.Header = uki.newClass(uki.view.Label, new function() {
-    var Base = uki.view.Label.prototype,
-        proto = this;
-        
-    proto._setup = function() {
+uki.view.table.Header = uki.newClass(uki.view.Label, function(Base) {
+    this._setup = function() {
         Base._setup.call(this);
         this._multiline = true;
+        this._resizers = [];
     };
     
-    proto.typeName = function() { return 'uki.view.table.Header'; };
+    this.typeName = function() { return 'uki.view.table.Header'; };
     
-    proto.columns = uki.newProp('_columns', function(v) {
+    this.columns = uki.newProp('_columns', function(v) {
         this._columns = v;
         this.html(this._createColumns());
         this._createResizers();
     });
     
-    proto._createColumns = function() {
+    this.redrawColumn = function(col) {
+        if (this._resizers[col]) {
+            uki.dom.unbind(this._resizers[col]);
+        }
+        var container = doc.createElement('div');
+        container.innerHTML = this._columns[col].renderHeader(this.rect().height);
+        this._label.replaceChild(container.firstChild, this._label.childNodes[col]);
+        if (this._columns[col].resizable()) this._createResizers(col);
+    };
+    
+    this._createColumns = function() {
         var html = [];
         for(var i = 0, offset = 0, columns = this._columns, l = columns.length; i < l; i++) {
             html[html.length] = columns[i].renderHeader(this.rect().height);
@@ -25,17 +33,20 @@ uki.view.table.Header = uki.newClass(uki.view.Label, new function() {
         return html.join('')
     };
     
-    proto._createResizers = function() {
-        for (var i=0, column, resizer, offset = 0; i < this._columns.length; i++) {
-            column = this._columns[i];
-            if (column.resizable()) {
-                var resizer = column.appendResizer(this._label.childNodes[i], this.rect().height);
-                this._bindResizerDrag(resizer, i);
-            }
-        };
+    this._createResizer = function(i) {
+        var column = this._columns[i];
+        if (column.resizable()) {
+            var resizer = column.appendResizer(this._label.childNodes[i], this.rect().height);
+            this._bindResizerDrag(resizer, i);
+            this._resizers[i] = resizer;
+        }
     };
     
-    proto._bindResizerDrag = function(resizer, columnIndex) {
+    this._createResizers = function() {
+        uki.each(this._columns, this._createResizer, this);
+    };
+    
+    this._bindResizerDrag = function(resizer, columnIndex) {
         uki.dom.bind(resizer, 'draggesture', uki.proxy(function(e) {
             var headerOffset = uki.dom.offset(this.dom()),
                 offsetWithinHeader = e.pageX - headerOffset.x,
@@ -46,5 +57,4 @@ uki.view.table.Header = uki.newClass(uki.view.Label, new function() {
             column.width(offsetWithinHeader - columnOffset);
         }, this));
     };
-    
 });

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

@@ -3,7 +3,7 @@ include('list.js');
 uki.view.table = {};
 
 uki.view.declare('uki.view.Table', uki.view.Container, function(Base) {
-    var propertiesToDelegate = 'rowHeight data packSize visibleRectExt render selectedIndex focusable textSelectable multiselect'.split(' ');
+    var propertiesToDelegate = 'rowHeight data packSize visibleRectExt render selectedIndex selectedIndexes selectedRows focus blur hasFocus lastClickIndex focusable textSelectable multiselect'.split(' ');
     
     this._rowHeight = 17;
     this._headerHeight = 17;
@@ -22,6 +22,14 @@ uki.view.declare('uki.view.Table', uki.view.Container, function(Base) {
         return Base._style.call(this, name, value);
     };
     
+    this.list = function() {
+        return this._list;
+    };
+    
+    this.header = function() {
+        return this._header;
+    };
+    
     this.columns = uki.newProp('_columns', function(c) {
         for (var i = 0; i < this._columns.length; i++) {
             this._columns[i].unbind();
@@ -39,6 +47,37 @@ uki.view.declare('uki.view.Table', uki.view.Container, function(Base) {
         this._header.columns(this._columns);
     });
     
+    this.redrawCell = function(row, col) {
+        var item = this._list._itemAt(row);
+        if (item) {
+            var cell, container = doc.createElement('div');
+            container.innerHTML = this.columns()[col].render(
+                this.data()[row],
+                new Rect(0, row*this.rowHeight(), this.list().width(), this.rowHeight()),
+                row
+            );
+            cell = container.firstChild;
+            item.replaceChild(cell, item.childNodes[col]);
+        }
+        return this;
+    };
+    
+    uki.each(['redrawRow', 'addRow', 'removeRow'], function(i, name) {
+        this[name] = function() {
+            this.list()[name].apply(this.list(), arguments);
+            return this;
+        };
+    }, this)
+    
+    this.redrawColumn = function(col) {
+        var from = this._list._packs[0].itemFrom,
+            to   = this._list._packs[1].itemTo
+        for (var i=from; i < to; i++) {
+            this.redrawCell(i, col);
+        };
+        return this;
+    };
+    
     this._updateTotalWidth = function() {
         this._totalWidth = 0;
         for (var i=0; i < this._columns.length; i++) {
@@ -55,7 +94,7 @@ uki.view.declare('uki.view.Table', uki.view.Container, function(Base) {
         var scrollPaneRect = new Rect(0, this._headerHeight, this.rect().width, this.rect().height - this._headerHeight),
             listRect = scrollPaneRect.clone().normalize(),
             headerRect = new Rect(0, 0, this.rect().width, this._headerHeight),
-            listML = { view: this._listImpl, rect: listRect, anchors: 'left top bottom', render: new uki.view.table.Render(this), className: 'table-list' },
+            listML = { view: this._listImpl, rect: listRect, anchors: 'left top bottom right', render: new uki.view.table.Render(this), className: 'table-list' },
             paneML = { view: 'ScrollPane', rect: scrollPaneRect, anchors: 'left top right bottom', scrollableH: true, childViews: [listML], className: 'table-scroll-pane'},
             headerML = { view: 'table.Header', rect: headerRect, anchors: 'top left right', className: 'table-header' };
             

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

@@ -48,7 +48,7 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
             this._input.placeholder = v;
         } else {
             if (!this._placeholderDom) {
-                this._placeholderDom = uki.createElement('div', this.defaultCss + 'z-input:103;color:#999;cursor:text', v);
+                this._placeholderDom = uki.createElement('div', this.defaultCss + 'z-input:103;color:#999;cursor:text;-moz-user-select:none;', v);
                 this._dom.appendChild(this._placeholderDom);
                 this._updatePlaceholderVis();
                 uki.each(['fontSize', 'fontFamily', 'fontWeight'], function(i, name) {
@@ -83,7 +83,6 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
         var tagName = this._multiline ? 'textarea' : 'input';
         this._dom = uki.createElement('div', Base.defaultCss + ';cursor:text;overflow:visible');
         this._input = uki.createElement(tagName, this.defaultCss + (this._multiline ? '' : ';overflow:hidden;'));
-        this._inputStyle = this._input.style;
         
         this._input.value = this._value;
         this._dom.appendChild(this._input);
@@ -92,8 +91,8 @@ uki.view.declare('uki.view.TextField', uki.view.Base, uki.view.Focusable, functi
         
         this._initFocusable(this._input);
         this.bind('mousedown', function(e) {
+            if (e.target == this._input) return;
             this.focus(); 
-            e.preventDefault();
         })
     };
     

data/lib/uki/project.rb

@@ -3,6 +3,8 @@ require 'commander/import'
 require 'erb'
 require 'pathname'
 require 'uki/include_js'
+require 'base64'
+require 'digest/md5'
 
 class Uki::Project
   attr_accessor :dest
@@ -29,8 +31,8 @@ class Uki::Project
     init_target target
     containers = find_containers
     cjs = extract_cjs(containers)
-    build_containers containers, target, options
     build_js cjs, target, options
+    build_containers containers, target, options
     build_images target, options
   end
   
@@ -40,13 +42,48 @@ class Uki::Project
     write_class template, path
   end
 
+  def create_function template, fullName
+    path = fullName.split('.')
+    create_packages path[0..-2]
+    write_function template, path
+  end
+  
+  def ie_images target
+    contents = File.read(File.join(dest, target))
+    place = File.join(dest, 'tmp', 'theme')
+    # button-full/normal-v.png
+    contents.scan(%r{\[[^"]*"([^"]+)"[^"]+"data:image/png;base64,([^"]+)"[^"\]]*(?:"([^"]+)"[^"\]]*)?\]}) do
+      p $1
+      file = File.join(place, $1)
+      FileUtils.mkdir_p File.dirname(file)
+      File.open(file, 'w') do |f| 
+        f.write Base64.decode64($2)
+      end
+      `convert #{File.join(place, $1)} #{File.join(place, $3)}` if $3
+    end
+    place
+  end
+  
   protected
     def write_class template, path
       package_name = path[0..-2].join('.')
-      class_name = path[-1]
-      class_name = class_name[0,1].upcase + class_name[1..-1]
-      file_name = class_name[0,1].downcase + class_name[1..-1]
-      target = File.join *(path[0..-2] + [file_name])
+      class_name   = path[-1]
+      class_name   = class_name[0,1].upcase + class_name[1..-1]
+      file_name    = class_name[0,1].downcase + class_name[1..-1]
+      target       = File.join *(path[0..-2] + [file_name])
+      target += '.js'
+      File.open(File.join(dest, target), 'w') do |f|
+        f.write template(template).result(binding)
+      end
+      add_include(target)
+    end
+    
+    def write_function template, path
+      package_name  = path[0..-2].join('.')
+      function_name = path[-1]
+      function_name = function_name[0,1].downcase   + function_name[1..-1]
+      file_name     = function_name
+      target        = File.join *(path[0..-2] + [file_name])
       target += '.js'
       File.open(File.join(dest, target), 'w') do |f|
         f.write template(template).result(binding)
@@ -98,8 +135,9 @@ class Uki::Project
   
     def build_containers containers, target, options
       containers.each do |c|
-        code = File.read(c).gsub(%r{=\s*["']?([^"' ]+.cjs)}) do |match|
-          match.sub('.cjs', '.js')
+        code = File.read(c).gsub(%r{=\s*["']?(([^"' ]+).cjs)}) do |match|
+          md5 = Digest::MD5.file(File.join(target, "#{$2}.js")).hexdigest
+          match.sub('.cjs', ".js?#{md5}")
         end
         File.open(File.join(target, File.basename(c)), 'w') do |f|
           f.write code
@@ -128,7 +166,7 @@ class Uki::Project
   
     def init_dest
       FileUtils.mkdir_p File.join(dest, project_name)
-      ['view', 'model'].each do |name| 
+      ['view', 'model', 'layout', 'controller'].each do |name| 
         FileUtils.mkdir_p File.join(dest, project_name, name)
       end
     end
@@ -140,14 +178,16 @@ class Uki::Project
       File.open(File.join(dest, "#{project_name}.js"), 'w') do |f|
         f.write template('myapp.js').result(binding)
       end
-      File.open(File.join(dest, project_name, 'view.js'), 'w') do |f|
-        package_name = "#{project_name}.view"
-        f.write template('package.js').result(binding)
-      end
-      File.open(File.join(dest, project_name, 'model.js'), 'w') do |f|
-        package_name = "#{project_name}.model"
-        f.write template('package.js').result(binding)
+      
+      create_function 'layout.js', "#{project_name}.layout.main"
+      
+      ['view', 'model', 'layout', 'controller'].each do |name|
+        File.open(File.join(dest, project_name, "#{name}.js"), 'w') do |f|
+          package_name = "#{project_name}.#{name}"
+          f.write template('package.js').result(binding)
+        end
       end
+      
     end
     
     def project_name

data/templates/controller.js.erb

@@ -0,0 +1,5 @@
+<% if package_name %>include('../<%= package_name.sub(/.*\./, '') %>.js');<% end %>
+
+<%= "#{package_name}." if package_name %><%= function_name %> = function() {
+    
+}

data/templates/layout.js.erb

@@ -0,0 +1,5 @@
+<% if package_name %>include('../<%= package_name.sub(/.*\./, '') %>.js');<% end %>
+
+<%= "#{package_name}." if package_name %><%= function_name %> = function() {
+    return uki({ view: 'Button', rect: '100 20 100 22', anchors: '', text: 'Hello world!' });
+}

data/templates/myapp.js.erb

@@ -34,8 +34,7 @@ uki.theme.airport.imagePath = 'i/';
 // skip interface creation if we're testing
 if (window.TESTING) return;
 
-uki({ view: 'Button', rect: '100 20 100 22', anchors: '', text: 'Hello world!' })
-    .attachTo(window, '300 62');
+<%= project_name %>.layout.main().attachTo(window, '300 62');
 
 uki('Button').click(function() {
     alert(this.text());

data/uki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uki}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-03-29}
+  s.date = %q{2010-04-05}
   s.default_executable = %q{uki}
   s.description = %q{Project creation, dev server, testing, building for uki apps}
   s.email = %q{voloko@gmail.com}
@@ -245,7 +245,9 @@ Gem::Specification.new do |s|
      "lib/uki/project.rb",
      "lib/uki/routes.rb",
      "lib/uki/server.rb",
+     "templates/controller.js.erb",
      "templates/index.html.erb",
+     "templates/layout.js.erb",
      "templates/model.js.erb",
      "templates/myapp.js.erb",
      "templates/package.js.erb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-29 00:00:00 +04:00
+date: 2010-04-05 00:00:00 +04:00
 default_executable: uki
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -293,7 +293,9 @@ files:
 - lib/uki/project.rb
 - lib/uki/routes.rb
 - lib/uki/server.rb
+- templates/controller.js.erb
 - templates/index.html.erb
+- templates/layout.js.erb
 - templates/model.js.erb
 - templates/myapp.js.erb
 - templates/package.js.erb