uki 1.0.0 → 1.0.1

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

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

@@ -6,13 +6,12 @@ include('../background.js');
  * @class
  */
 uki.background.Rows = uki.newClass(new function() {
-    var proto = this,
-        cache = [],
+    var cache = [],
         packSize = 100;
     
     /**#@+ @memberOf uki.background.Rows.prototype */
     
-    proto.init = function(height, colors) {
+    this.init = function(height, colors) {
         this._height = height || 20;
         this._colors = uki.isArray(colors) ? colors : colors.split(' ');
         this._packSize = CEIL(packSize/this._colors.length)*this._colors.length;
@@ -21,7 +20,7 @@ uki.background.Rows = uki.newClass(new function() {
         if (this._colors.length == 1) this._colors = this._colors.concat(['#FFF']);
     };
     
-    proto.attachTo = function(comp) {
+    this.attachTo = function(comp) {
         this._comp && this.detach();
         this._comp = comp;
         if (!this._container) {
@@ -35,7 +34,7 @@ uki.background.Rows = uki.newClass(new function() {
         this._comp.bind('layout', this._layoutHandler);
     };
     
-    proto.layout = function(rect, visibleRect) {
+    this.layout = function(rect, visibleRect) {
         var height = visibleRect ? visibleRect.height + this._visibleExt*2 : rect.maxY();
         while (this._renderedHeight < height) {
             var h = packSize * this._height,
@@ -48,7 +47,8 @@ uki.background.Rows = uki.newClass(new function() {
         }
     };
     
-    proto.detach = function() {
+    this.detach = function() {
+        if (!this._comp) return;
         this._comp.dom().removeChild(this._container);
         this._comp.unbind('layout', this._layoutHandler);
         this._comp = null;

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

@@ -52,7 +52,7 @@ uki.background.Sliced9 = uki.newClass(new function() {
 
     /** @ignore */
     function img (setting, style) {
-        return uki.imageHTML(setting[0], setting[1], setting[2], ' galleryimg="no" style="-webkit-user-drag:none;position:absolute;' + style + '"');
+        return uki.imageHTML(setting[0], setting[1], setting[2], ' ondragstart="return false;" galleryimg="no" style="-webkit-user-drag:none;position:absolute;' + style + '"');
     }
     
     /** @ignore */
@@ -101,7 +101,7 @@ uki.background.Sliced9 = uki.newClass(new function() {
         }
         if (settings.m) {
             html[html.length] = makeDiv('m',
-                [LEFT + inset.left + PX, TOP + inset.top + PX, RIGHT + inset.left + PX, BOTTOM + inset.bottom + PX].join(';'),
+                [LEFT + inset.left + PX, TOP + inset.top + PX, RIGHT + inset.right + PX, BOTTOM + inset.bottom + PX].join(';'),
                 settings.m, [LEFT + 0, TOP + 0, HEIGHT + P100, WIDTH + P100].join(';'), ''
             );
         }

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

@@ -167,8 +167,7 @@ uki.fn = uki.Collection.prototype = new function() {
     @name uki.Collection#focusable */
     /** @function
     @name uki.Collection#style */
-    uki.Collection.addAttrs(('dom,html,text,background,value,rect,checked,anchors,' +
-        'childViews,typeName,id,name,visible,disabled,focusable,style').split(','));
+    uki.Collection.addAttrs('dom html text background value rect checked anchors childViews typeName id name visible disabled focusable style draggable textSelectable'.split(' '));
 
     /** @function
     @name uki.Collection#parent */

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

@@ -1,3 +1,4 @@
+include('const.js');
 /**
  * Shortcut access to uki.build, uki.Selector.find and uki.Collection constructor
  * uki('#id') is also a shortcut for search by id
@@ -9,7 +10,7 @@
  * @name uki
  * @return {uki.Collection}
  */
-root.uki = function(val, context) {
+root.uki = root.uki || function(val, context) {
     if (typeof val == 'string') {
         var m = val.match(/^#((?:[\w\u00c0-\uFFFF_-]|\\.)+)$/),
             e = m && uki._ids[m[1]];
@@ -27,7 +28,7 @@ root.uki = function(val, context) {
  * @type string
  * @field
  */
-uki.version = '0.1.0.1';
+uki.version = '0.1.2';
 
 /**
  * Empty function

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

@@ -2,17 +2,17 @@ include('uki.js');
 
 var toString = Object.prototype.toString,
     trim = String.prototype.trim,
+    slice = Array.prototype.slice,
     
     trimRe = /^\s+|\s+$/g;
     
 var marked = '__uki_marked';
-	
-var utils = 
+
+ 
 /**
- * Utility functions. Can be called both as uki.utils.function or uki.function
- * @namespace
+ * Utility functions.
  */
-uki.utils = {
+var utils = {
     
     /**
      * Sets or retrieves attribute on an object. 
@@ -30,16 +30,16 @@ uki.utils = {
      */
     attr: function(target, attr, value) {
         if (value !== undefined) {
-            // if (target[attr].apply) {
-            if (utils.isFunction(target[attr])) {
+            if (target[attr] && target[attr].apply) {
+            // if (uki.isFunction(target[attr])) {
                 target[attr](value);
             } else {
                 target[attr] = value;
             }
             return target;
         } else {
-            // if (target[attr].apply) {
-            if (utils.isFunction(target[attr])) {
+            if (target[attr] && target[attr].apply) {
+            // if (uki.isFunction(target[attr])) {
                 return target[attr]();
             } else {
                 return target[attr];
@@ -54,9 +54,12 @@ uki.utils = {
      * @param {object} context
      */
     proxy: function(fn, context) {
-        return function() {
-            return fn.apply(context, arguments);
-        }
+        var args = slice.call(arguments, 2),
+            result = function() {
+                return fn.apply(context, args.concat(slice.call(arguments, 0)));
+            };
+        result.huid = fn.huid = fn.huid || uki.dom.guid++;
+        return result;
     },
     
     /**
@@ -213,8 +216,8 @@ uki.utils = {
      */
     map: function( elems, callback, context ) {
         var ret = [],
-            mapper = utils.isFunction(callback) ? callback : 
-                     function(e) { return utils.attr(e, callback); };
+            mapper = uki.isFunction(callback) ? callback : 
+                     function(e) { return uki.attr(e, callback); };
 
         for ( var i = 0, length = elems.length; i < length; i++ ) {
             var value = mapper.call( context || elems[ i ], elems[ i ], i );
@@ -312,7 +315,7 @@ uki.utils = {
             tmp = arguments[i];
             if (this.isFunction(tmp)) tmp = tmp.apply(tmp, baseClasses);
             baseClasses.push(tmp);
-            utils.extend(klass.prototype, arguments[i]);
+            uki.extend(klass.prototype, arguments[i]);
         };
         if (!klass.prototype.init) klass.prototype.init = function() {};
         return klass;
@@ -372,22 +375,22 @@ uki.utils = {
      * @param {Array.<string>} props Property names
      */
     addProps: function(proto, props) {
-        utils.each(props, function() { proto[this] = utils.newProp('_' + this); });
+        uki.each(props, function() { proto[this] = uki.newProp('_' + this); });
     },
     
     toArray: function(arr) {
-        return Array.prototype.slice.call(arr, 0);
+        return slice.call(arr, 0);
     },
     
     delegateProp: function(proto, name, target) {
         var propName = '_' + name;
         proto[name] = function(value) {
             if (value === undefined) {
-                if (this[target]) return utils.attr(this[target], name, value);
+                if (this[target]) return uki.attr(this[target], name, value);
                 return this[propName];
             }
             if (this[target]) {
-                utils.attr(this[target], name, value);
+                uki.attr(this[target], name, value);
             } else {
                 this[propName] = value;
             }
@@ -395,5 +398,5 @@ uki.utils = {
         };
     }
 };
-
-utils.extend(uki, utils);
+utils.extend(uki, utils);
+delete utils;

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

@@ -274,25 +274,22 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
         this._firstLayout = false;
     };
     
-    /**
-     * @function
-     */
-    this.minSize = uki.newProp('_minSize', function(s) {
-        this._minSize = Size.create(s);
-        this.rect(this._parentRect);
-        if (this._minSize.width) this._dom.style.minWidth = this._minSize.width + PX;
-        if (this._minSize.height) this._dom.style.minHeight = this._minSize.height + PX;
-    });
     
     /**
-     * @function
+     * @function uki.view.Base#minSize
+     * @function uki.view.Base#maxSize
      */
-    this.maxSize = uki.newProp('_maxSize', function(s) {
-        this._maxSize = Size.create(s);
-        this.rect(this._parentRect);
-        if (this._maxSize.width) this._dom.style.maxWidth = this._maxSize.width + PX;
-        if (this._maxSize.height) this._dom.style.maxHeight = this._maxSize.height + PX;
-    });
+    uki.each(['min', 'max'], function(i, name) {
+        var attr = name + 'Size',
+            prop = '_' + attr;
+        this[attr] = function(s) {
+            if (s === undefined) return this[prop] || new Size();
+            this[prop] = Size.create(s);
+            this.rect(this._parentRect);
+            if (this[prop].width) this._dom.style[name + 'Width'] = this[prop].width + PX;
+            if (this[prop].height) this._dom.style[name + 'Height'] = this[prop].height + PX;
+        };
+    }, this);
     
     /**
      * Resizes view when parent changes size according to anchors.
@@ -431,7 +428,9 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
     @name uki.view.Base#top */
     uki.each(['width', 'height', 'minX', 'maxX', 'minY', 'maxY', 'left', 'top'], function(index, attr) {
         this[attr] = function(value) {
-            return uki.attr(this.rect(), attr, value);
+            if (value === undefined) return uki.attr(this.rect(), attr);
+            uki.attr(this.rect(), attr, value);
+            return this;
         };
     }, this);
     

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

@@ -54,7 +54,7 @@ uki.view.Styleable = new function() {
         if (this._textSelectProp) {
             this._dom.style[this._textSelectProp] = state ? '' : this._textSelectProp == 'MozUserSelect' ? '-moz-none' : 'none';
         } else {
-            // uki.dom[state ? 'unbind' : 'bind'](this.dom(), 'selectstart mousedown', uki.dom.preventDefaultHandler);
+            uki.dom[state ? 'unbind' : 'bind'](this.dom(), 'selectstart', uki.dom.preventDefaultHandler);
         }
         this._dom.style.cursor = state ? 'text' : 'default';
         return this;