uki 1.1.0 → 1.1.1

data/frameworks/uki/examples/views/example.haml

@@ -0,0 +1,8 @@
+!!!1.1
+%head
+  %title= title
+%body
+  = html
+  - unless DEVELOPMENT
+    = File.read File.join(File.dirname(__FILE__), 'ga.txt')
+  

data/frameworks/uki/examples/views/exampleList.haml

@@ -0,0 +1,24 @@
+!!!1.1
+%html
+  %head
+    %meta{ "http-equiv" => "Content-type", "content" => "text/html; charset=utf-8" }
+    %title Uki examples
+    %link{ :rel => 'stylesheet', :href => '/examples/css/reset.css', :type => 'text/css', :media => 'screen' }
+    %link{ :rel => 'stylesheet', :href => '/examples/css/examples.css', :type => 'text/css', :media => 'screen' }
+    
+  %body.text
+    %h1 <a href="/">Uki</a> code examples
+    %ul
+      - lastExample = nil
+      - exampleList.each do |example|
+        - if lastExample && example[:order] - lastExample[:order] > 100
+          %li
+            %br
+        - lastExample = example
+        %li
+          %a{:href => example[:path]}= example[:title]
+          %small
+            %a{:href => "http://github.com/voloko/ukijs.org/tree/master/examples/#{example[:path]}/"} source
+    - unless DEVELOPMENT
+      = File.read File.join(File.dirname(__FILE__), 'ga.txt')
+    

data/frameworks/uki/server.rb

@@ -0,0 +1,84 @@
+SERVER_ROOT = File.expand_path(File.dirname(__FILE__))
+DEVELOPMENT = ENV['RACK_ENV'] != 'production'
+
+def get_example_page(path)
+  name = File.basename(path)
+  html_path = File.join(path, name + '.html')
+  if(File.exist?(html_path))
+    File.read(html_path)
+  else
+    nil
+  end
+end
+
+def list_examples(path)
+  result = []
+  Dir.new(path).each { |name| 
+    if File.exist?(File.join(path, name, name + '.js'))
+      result << name
+    elsif !name.start_with?('.') && File.directory?(File.join(path, name))
+      result += list_examples(File.join(path, name)).map do |subname|
+        File.join(name, subname)
+      end
+    end 
+  }
+  result
+end
+
+def replace_src_paths(html, version_info)
+  version = version_info['version']
+  html.gsub(%r{src\s*=\s*["']/src/(.*?)\.cjs['"]}, "src='http://static.ukijs.org/pkg/#{version}/\\1.js'")
+end
+
+def extract_example_info path, &block
+  name = File.basename(path)
+  js_path = File.join(path, name + '.js')
+  js_contents = File.read(js_path)
+  yield js_contents
+end
+
+def extract_example_html(path)
+  extract_example_info(path) { |js_contents|
+    js_contents.match(%r{@example_html((.|[\n\r])*?)\*/})[1] rescue 'No html'
+  }
+end
+
+def extract_example_title(path)
+  extract_example_info(path) { |js_contents|
+    js_contents.match(%r{@example_title(.*?)(\*/|$)})[1] rescue 'Untitled'
+  }
+end
+
+def extract_example_order(path)
+  extract_example_info(path) { |js_contents|
+    js_contents.match(%r{@example_order(.*?)(\*/|$)})[1].to_i rescue 9e6
+  }
+end
+
+def encode64(str)
+  Base64.encode64(str).gsub("\n", '')
+end
+
+set :views, File.join(SERVER_ROOT, 'examples', 'views')
+set :public, File.join(SERVER_ROOT, 'examples')
+
+get '/' do
+  path = File.join(SERVER_ROOT, 'examples')
+  exampleList = list_examples(path).map do |name|
+    { 
+      :path => name + '/', 
+      :title => extract_example_title(File.join(path, name)),
+      :order => extract_example_order(File.join(path, name)) 
+    }
+  end.sort { |e1, e2| e1[:order] <=> e2[:order] }.select { |e| e[:order] > 0 }
+  haml :exampleList, :locals => { :exampleList => exampleList }
+end
+
+get '/:type/:example/' do
+  path = File.join(SERVER_ROOT, 'examples', params[:type], params[:example])
+  page = get_example_page(path)
+  page || haml(:example, :locals => {
+      :html => extract_example_html(path), 
+      :title => extract_example_title(path)}
+    )
+end

data/frameworks/uki/spec/support/spec.helper.js

@@ -1 +1,37 @@
-// write your helper methods here
+var triggerEvent,
+    mouseButtonsEvent;
+if (document.createEventObject) {
+    triggerEvent = function(el, type, params) {
+        var event = uki.extend(
+            document.createEventObject(), 
+            params
+        );
+        
+        return el.fireEvent('on' + type, event);
+    };
+} else {
+    triggerEvent = function(el, type, params) {
+        var event = document.createEvent('MouseEvents');   
+        event.initMouseEvent(
+            type,
+            true,
+            true,
+            document.defaultView,
+            params.detail    || 0,
+            params.screenX   || 0,
+            params.screenY   || 0,
+            params.clientX   || 0,
+            params.clientY   || 0,
+            params.ctrlKey   || false,
+            params.altKey    || false,
+            params.shiftKey  || false,
+            params.metaKey   || false,
+            params.button    || 0,
+            null
+        );
+        uki.extend(event);
+        
+        el.dispatchEvent(event);
+    };
+}
+

data/frameworks/uki/src/uki-core/background/cssBox.js

@@ -37,7 +37,7 @@ uki.background.CssBox = uki.newClass(new function() {
         this._container = uki.createElement(
             'div', 
             options + ';position:absolute;overflow:hidden;z-index:' + (ext.zIndex || '-1') + ';' + 
-            'left:' + inset.left + ';top:' + inset.top + 'px;right:' + inset.right + 'px;bottom:' + inset.bottom + 'px',
+            'left:' + inset.left + 'px;top:' + inset.top + 'px;right:' + inset.right + 'px;bottom:' + inset.bottom + 'px',
             ext.innerHTML
         );
         this._attached = false;

data/frameworks/uki/src/uki-core/builder.js

@@ -23,7 +23,9 @@ include('collection.js');
         if (ml.length === undefined) ml = [ml];
         return new uki.Collection(createMulti(ml));
     };
-
+    
+    uki.viewNamespaces = ['uki.view.', ''];
+    
     function createMulti (ml) {
         return uki.map(ml, function(mlRow) { return createSingle(mlRow); });
     }
@@ -36,18 +38,21 @@ include('collection.js');
         var c = mlRow.view || mlRow.type,
             result;
         if (uki.isFunction(c)) {
-            result = c();
+            result = new c(mlRow.rect);
         } else if (typeof c === 'string') {
-            var parts = c.split('.'),
-                obj   = root;
-            if (!root[parts[0]] || parts[0] == 'Image') {
-                parts = ['uki', 'view'].concat(parts); // try with default prefix
-            }
-            for (var i=0; i < parts.length; i++) {
-                obj = obj[parts[i]];
+            for (var i=0, ns = uki.viewNamespaces; i < ns.length; i++) {
+                var parts = (ns[i] + c).split('.'),
+                    obj = root;
+                
+                for (var j=0; obj && j < parts.length; j++) {
+                    obj = obj[parts[j]];
+                };
+                if (obj) {
+                    result = new obj(mlRow.rect);
+                    break;
+                }
             };
             if (!obj) throw 'No view of type ' + c + ' found';
-            result = new obj(mlRow.rect);
         } else {
             result = c;
         }

data/frameworks/uki/src/uki-core/dom/dnd.js

@@ -19,7 +19,8 @@ try {
         typeof doc.createEvent('MouseEvent').dataTransfer == 'object' || // safari
         doc.createEvent('DragEvent').initDragEvent // w3c support
     ) {
-        dnd.nativeDnD = true;
+        // Google Chrome has to many issues with native d&d. It is simpler to disable than to fix
+        dnd.nativeDnD = !ua.match(/Chrome\/4/);
     }
 } catch (e) {}
 

data/frameworks/uki/src/uki-core/uki.js

@@ -28,7 +28,7 @@ root.uki = root.uki || function(val, context) {
  * @type string
  * @field
  */
-uki.version = '0.1.3';
+uki.version = '0.2.2';
 uki.guid = 1;
 
 /**

data/frameworks/uki/src/uki-core/utils.js

@@ -299,7 +299,7 @@ var utils = {
                 this.init.apply(this, arguments);
             };
             
-        var inheritance, i, startFrom = 0, tmp, baseClasses = [];
+        var inheritance, i, startFrom = 0, tmp, baseClasses = [], base, name, copy;
             
         if (arguments.length > 1) {
             if (arguments[0].prototype) { // real inheritance
@@ -312,10 +312,17 @@ var utils = {
             }
         }
         for (i=startFrom; i < arguments.length; i++) {
-            tmp = arguments[i];
+            base = tmp = arguments[i];
             if (this.isFunction(tmp)) tmp = tmp.apply(tmp, baseClasses);
             baseClasses.push(tmp);
-            uki.extend(klass.prototype, arguments[i]);
+            
+            for ( name in base ) {
+                copy = base[ name ];
+                if ( !base.hasOwnProperty(name) || copy === undefined ) continue;
+                klass.prototype[ name ] = copy;
+            }
+            
+            // uki.extend(klass.prototype, base);
         };
         if (!klass.prototype.init) klass.prototype.init = function() {};
         return klass;

data/frameworks/uki/src/uki-core/view/base.js

@@ -18,8 +18,7 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
 
     var layoutId = 1;
 
-    this.defaultCss = 'position:absolute;z-index:100;-moz-user-focus:none;'
-                     + 'font-family:Arial,Helvetica,sans-serif;';
+    this.defaultCss = 'position:absolute;z-index:100;-moz-user-focus:none;';
     
     /**
      * Base class for all uki views.
@@ -79,6 +78,7 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
            _styleV: 'top',
            _firstLayout: true
         });
+        this.defaultCss += uki.theme.style('base');
     };
     
     /**

data/frameworks/uki/src/uki-theme/airport.js

@@ -304,6 +304,20 @@
                 return handle;
                 
             }
+        },
+        styles: {
+            base: function() {
+                return 'font-family:Arial,Helvetica,sans-serif;';
+            },
+            'label': function() {
+                return 'font-size:12px;';
+            },
+            'button': function() {
+                return 'color:#333;text-align:center;font-weight:bold;';
+            },
+            'input': function() {
+                return 'font-size:11px;';
+            }
         }
     });
 

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

@@ -8,9 +8,9 @@ uki.view.declare('uki.view.Button', uki.view.Label, uki.view.Focusable, function
     this._setup = function() {
         Base._setup.call(this);
         uki.extend(this, {
-            _inset: new Inset(0, 4),
-            defaultCss: Base.defaultCss + "cursor:default;-moz-user-select:none;-webkit-user-select:none;" //text-shadow:0 1px 0px rgba(255,255,255,0.8)
+            _inset: new Inset(0, 4)
         });
+        this.defaultCss += "cursor:default;-moz-user-select:none;-webkit-user-select:none;" + uki.theme.style('button');
     };
     
     uki.addProps(this, ['backgroundPrefix']);
@@ -47,11 +47,9 @@ uki.view.declare('uki.view.Button', uki.view.Label, uki.view.Focusable, function
         
     this._createDom = function() {
         // dom
-        this._dom = uki.createElement('div', this.defaultCss + 'color:#333;text-align:center;');
-        this._label = uki.createElement('div', Base.defaultCss + 
-            "font-size:12px;line-height:12px;white-space:nowrap;"); // text-shadow:0 1px 0px rgba(255,255,255,0.8);
+        this._dom = uki.createElement('div', this.defaultCss);
+        this._label = uki.createElement('div', this.defaultCss); // text-shadow:0 1px 0px rgba(255,255,255,0.8);
         this._dom.appendChild(this._label);
-        this.style('fontWeight', 'bold');
         
         this._dom.appendChild(uki.createElement('div', 'left:0;top:0;width:100%;height:100%;position:absolute;background:url(' + uki.theme.imageSrc('x') + ');'));
         

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

@@ -9,10 +9,11 @@ uki.view.declare('uki.view.Label', uki.view.Base, function(Base) {
             _textSelectable: false,
             _inset: new Inset()
         });
+        this.defaultCss += uki.theme.style('label');
     };
     
     this._style = function(name, value) {
-        if (value !== undefined && 'font fontFamily fontWeight fontSize textDecoration color'.indexOf(name) != -1) {
+        if (value !== undefined && 'font fontFamily fontWeight fontSize textDecoration textOverflow textAlign overflow color'.indexOf(name) != -1) {
             this._label.style[name] = value;
         }
         return Base._style.call(this, name, value);
@@ -85,8 +86,7 @@ uki.view.declare('uki.view.Label', uki.view.Base, function(Base) {
     
     this._createDom = function() {
         Base._createDom.call(this);
-        this._label = uki.createElement('div', Base.defaultCss + 
-            "font-size:12px;white-space:nowrap;"); // text-shadow:0 1px 0px rgba(255,255,255,0.8);
+        this._label = uki.createElement('div', this.defaultCss + 'white-space:nowrap;'); // text-shadow:0 1px 0px rgba(255,255,255,0.8);
         this._dom.appendChild(this._label);
         this.textSelectable(this.textSelectable());
     };

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

@@ -58,22 +58,25 @@ uki.view.declare('uki.view.List', uki.view.Base, uki.view.Focusable, function(Ba
     this.addRow = function(position, data) {
         this._data.splice(position, 0, data);
         var item = this._itemAt(position);
+        var container = doc.createElement('div');
+        
+        container.innerHTML = this._rowTemplate.render({ 
+            height: this._rowHeight, 
+            text: this._render.render(this._data[position], this._rowRect(position), position)
+        });
         if (item) {
-            var container = doc.createElement('div');
-            
-            container.innerHTML = this._rowTemplate.render({ 
-                height: this._rowHeight, 
-                text: this._render.render(this._data[position], this._rowRect(position), position)
-            });
             item.parentNode.insertBefore(container.firstChild, item);
-            if (position < this._packs[0].itemTo) {
-                this._packs[0].itemTo++;
-                this._packs[1].itemFrom++;
-                this._packs[1].itemTo++;
-                this._packs[1].dom.style.top = this._packs[1].itemFrom*this._rowHeight + 'px';
-            } else {
-                this._packs[1].itemTo++;
-            }
+        } else {
+            this._dom.childNodes[0].appendChild(container.firstChild);
+        }
+
+        if (position <= this._packs[0].itemTo) {
+            this._packs[0].itemTo++;
+            this._packs[1].itemFrom++;
+            this._packs[1].itemTo++;
+            this._packs[1].dom.style.top = this._packs[1].itemFrom*this._rowHeight + 'px';
+        } else {
+            this._packs[1].itemTo++;
         }
         
         // offset selection
@@ -82,6 +85,10 @@ uki.view.declare('uki.view.List', uki.view.Base, uki.view.Focusable, function(Ba
             this._selectedIndexes[i]++;
         };
         
+        // needed for scrollbar
+        this.minSize(new Size(this.minSize().width, this._rowHeight * this._data.length));
+        this._relayoutParent();
+
         return this;
     };
     
@@ -106,16 +113,19 @@ uki.view.declare('uki.view.List', uki.view.Base, uki.view.Focusable, function(Ba
     
     this.selectedIndexes = function(indexes) {
         if (indexes === undefined) return this._selectedIndexes;
-        var changed = indexes != this._selectedIndexes;
         this.clearSelection(true);
         this._selectedIndexes = indexes;
         for (var i=0; i < this._selectedIndexes.length; i++) {
             this._setSelected(this._selectedIndexes[i], true);
         };
-        if (changed) this.trigger('selection', {source: this});
+        this.trigger('selection', {source: this});
         return this;
     };
     
+    this.selectedRow = function() {
+        return this._data[this.selectedIndex()];
+    };    
+    
     this.selectedRows = function() {
         return uki.map(this.selectedIndexes(), function(index) {
             return this._data[index];

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

@@ -47,11 +47,11 @@ uki.view.declare('uki.view.Slider', uki.view.Base, uki.view.Focusable, function(
     };
     
     this._createDom = function() {
-        this._dom = uki.createElement('div', Base.defaultCss + 'height:18px;-moz-user-select:none;-webkit-user-select:none;overflow:visible;');
-        this._handle = uki.createElement('div', Base.defaultCss + 'overflow:hidden;cursor:default;background:url(' + uki.theme.image('x').src + ')');
+        this._dom = uki.createElement('div', this.defaultCss + 'height:18px;-moz-user-select:none;-webkit-user-select:none;overflow:visible;');
+        this._handle = uki.createElement('div', this.defaultCss + 'overflow:hidden;cursor:default;background:url(' + uki.theme.image('x').src + ')');
         this._bg = uki.theme.image('slider-handle');
         this._focusBg = uki.theme.image('slider-focus');
-        this._focusBg.style.cssText += this._bg.style.cssText += Base.defaultCss + 'top:0;left:0;z-index:-1;position:absolute;'; 
+        this._focusBg.style.cssText += this._bg.style.cssText += this.defaultCss + 'top:0;left:0;z-index:-1;position:absolute;'; 
         this._handle.appendChild(this._bg);
         
         

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

@@ -73,7 +73,7 @@ uki.view.declare('uki.view.HSplitPane', uki.view.Container, function(Base) {
     };
     
     this._createDom = function() {
-        this._dom = uki.createElement('div', Base.defaultCss);
+        this._dom = uki.createElement('div', this.defaultCss);
         for (var i=0, paneML; i < 2; i++) {
             paneML = { view: 'Container' };
             paneML.anchors = i == 1         ? 'left top bottom right' :