uki 1.1.1 → 1.1.2

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

@@ -1,5 +1,6 @@
 include('uki.js');
-
+(function() {
+    
 var toString = Object.prototype.toString,
     trim = String.prototype.trim,
     slice = Array.prototype.slice,
@@ -8,7 +9,10 @@ var toString = Object.prototype.toString,
     
 var marked = '__uki_marked';
 
- 
+// dummy subclass
+/** @ignore */
+function inheritance () {}
+
 /**
  * Utility functions.
  */
@@ -164,7 +168,7 @@ var utils = {
     	        array[i][marked] = true;
     	    };
     	    for (i = 0; i < result.length; i++) { 
-    	        delete result[i][marked] 
+    	        delete result[i][marked];
     	    };
     	    return result;
         	
@@ -259,13 +263,13 @@ var utils = {
      */
     extend: function() {
         var target = arguments[0] || {}, i = 1, length = arguments.length, options;
-
+		
         for ( ; i < length; i++ ) {
             if ( (options = arguments[i]) != null ) {
                 
                 for ( var name in options ) {
                     var copy = options[ name ];
-
+					
                     if ( copy !== undefined ) {
                         target[ name ] = copy;
                     }
@@ -273,7 +277,7 @@ var utils = {
                 }
             }
         }
-
+		
         return target;      
     },
     
@@ -297,32 +301,37 @@ var utils = {
     newClass: function(/* [[superClass], mixin1, mixin2, ..] */ methods) {
         var klass = function() {
                 this.init.apply(this, arguments);
-            };
+            },
             
-        var inheritance, i, startFrom = 0, tmp, baseClasses = [], base, name, copy;
-            
-        if (arguments.length > 1) {
-            if (arguments[0].prototype) { // real inheritance
-                /** @ignore */
-                inheritance = function() {};
-                inheritance.prototype = arguments[0].prototype;
+			i, startFrom = 0, tmp, baseClasses = [], base, name, copy, $arguments = arguments, length;
+		
+        if ((length = $arguments.length) > 1) {
+            base = $arguments[0];
+            if (base.prototype) { // real inheritance
+                inheritance.prototype = base.prototype;
                 klass.prototype = new inheritance();
                 startFrom = 1;
                 baseClasses = [inheritance.prototype];
+                
+                // class method inheritance
+                for ( name in base ) {
+                    copy = base[ name ];
+                    if ( !base.hasOwnProperty(name) || copy === undefined || name == 'prototype' ) continue;
+                    klass[ name ] = copy;
+                }
             }
         }
-        for (i=startFrom; i < arguments.length; i++) {
-            base = tmp = arguments[i];
-            if (this.isFunction(tmp)) tmp = tmp.apply(tmp, baseClasses);
-            baseClasses.push(tmp);
-            
-            for ( name in base ) {
-                copy = base[ name ];
-                if ( !base.hasOwnProperty(name) || copy === undefined ) continue;
-                klass.prototype[ name ] = copy;
+
+        for (i=startFrom; i < length; i++) {
+            base = $arguments[i];
+            if (this.isFunction(base)) {
+                tmp = {};
+                base.apply(tmp, baseClasses);
+                base = tmp;
             }
+            baseClasses[ baseClasses.length ] = base;
             
-            // uki.extend(klass.prototype, base);
+            uki.extend(klass.prototype, base);
         };
         if (!klass.prototype.init) klass.prototype.init = function() {};
         return klass;
@@ -336,10 +345,12 @@ var utils = {
      */
     binarySearch: function (value, array) {
         var low = 0, high = array.length, mid;
+		
         while (low < high) {
             mid = (low + high) >> 1;
             array[mid] < value ? low = mid + 1 : high = mid;
         }
+        
         return low;
     },
     
@@ -382,7 +393,8 @@ var utils = {
      * @param {Array.<string>} props Property names
      */
     addProps: function(proto, props) {
-        uki.each(props, function() { proto[this] = uki.newProp('_' + this); });
+        for (var i =0, len = props.length; i<len; i++)
+			proto[ props[i] ] = uki.newProp('_' + props[i]);
     },
     
     toArray: function(arr) {
@@ -403,7 +415,20 @@ var utils = {
             }
             return this;
         };
+    },
+    
+    camalize: function(string) {
+        return string.replace(/[-_]\S/g, function(v) {
+            return v.substr(1).toUpperCase();
+        });
+    },
+    
+    dasherize: function(string) {
+        return string.replace(/[A-Z]/g, function(v) {
+            return '-' + v.toLowerCase();
+        });
     }
 };
 utils.extend(uki, utils);
-delete utils;
+
+})();

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

@@ -7,15 +7,18 @@ uki.view = {
             klass = uki.newClass.apply(uki, args),
             parts = name.split('.'),
             obj   = root,
-            i, part;
+            i, part, l = parts.length - 1;
         
         klass.prototype.typeName = function() { return name; };
-        for ( i=0; i < parts.length - 1; i++ ) {
+		
+        for ( i= 0; i < l; i++ ) {
             part = parts[i];
             if (!obj[part]) obj[part] = {};
             obj = obj[part];
+			
         };
-        obj[parts[parts.length - 1]] = klass;
+		
+        obj[ parts[l] ] = klass;
         return klass;
     }
 };

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

@@ -3,7 +3,6 @@ include('../geometry.js');
 include('../utils.js');
 include('../builder.js');
 include('../dom.js');
-include('../dom/nativeLayout.js');
 include('observable.js');
 include('styleable.js');
 
@@ -274,6 +273,10 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
         this._firstLayout = false;
     };
     
+    this.layoutIfNeeded = function() {
+        if (this._needsLayout && this.visible()) this.layout();
+    };
+    
     
     /**
      * @function uki.view.Base#minSize
@@ -318,6 +321,13 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
         this.rect(newRect);
     };
     
+    /**
+     * Called when child changes it's size
+     */
+    this.childResized = function(child) {
+        // do nothing, extend in subviews
+    };
+    
     /**
      * Resizes view to its contents. Contents size is determined by view.
      * View can be resized by width, height or both. This is specified through
@@ -442,6 +452,11 @@ uki.view.declare('uki.view.Base', uki.view.Observable, uki.view.Styleable, funct
      */
     this._createDom = function() {
         this._dom = uki.createElement('div', this.defaultCss);
+        this._initClassName();
+    };
+    
+    this._initClassName = function() {
+        this._dom.className = this.typeName().replace(/\./g, '-');
     };
     
     /**

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

@@ -8,6 +8,8 @@ include('base.js');
 uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
     /**#@+ @memberOf uki.view.Container# */
     
+    this._inset = new Inset();
+    
     /** @private */
     this._setup = function() {
         this._childViews = [];
@@ -25,11 +27,11 @@ uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
     }
     
     this.contentsWidth = function() {
-        return maxProp(this, 'maxX');
+        return maxProp(this, 'maxX') + this.inset().right;
     };
     
     this.contentsHeight = function() {
-        return maxProp(this, 'maxY');
+        return maxProp(this, 'maxY') + this.inset().bottom;
     };
     
     this.contentsSize = function() {
@@ -65,6 +67,7 @@ uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
             this._childViews[i]._viewIndex--;
         };
         this._childViews = uki.grep(this._childViews, function(elem) { return elem != child; });
+        this._contentChanged();
     };
     
     /**
@@ -75,6 +78,7 @@ uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
         this._childViews.push(child);
         child.parent(this);
         this.domForChild(child).appendChild(child.dom());
+        this._contentChanged();
     };
     
     /**
@@ -91,6 +95,7 @@ uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
         this._childViews.splice(beforeChild._viewIndex-1, 0, child);
         child.parent(this);
         this.domForChild(child).insertBefore(child.dom(), beforeChild.dom());
+        this._contentChanged();
     };
     
     /**
@@ -101,8 +106,15 @@ uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
         return this._dom;
     };
     
+    this.inset = uki.newProp('_inset', function(v) {
+        this._inset = Inset.create(v);
+    });
     
     /** @private */
+    this._contentChanged = function() {
+        // called on every insertBefore, appendChild, removeChild
+    };
+    
     this._layoutDom = function(rect) {
         Base._layoutDom.call(this, rect);
         this._layoutChildViews(rect);
@@ -111,9 +123,7 @@ uki.view.declare('uki.view.Container', uki.view.Base, function(Base) {
     /** @private */
     this._layoutChildViews = function() {
         for (var i=0, childViews = this.childViews(); i < childViews.length; i++) {
-            if (childViews[i]._needsLayout && childViews[i].visible()) {
-                childViews[i].layout(this._rect);
-            }
+            childViews[i].layoutIfNeeded();
         };
     };
     

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

@@ -2,7 +2,7 @@ include('../view.js');
 include('observable.js');
 
 /**
- * @class
+ * @interface
  */
 uki.view.Focusable = new function() {/** @lends uki.view.Focusable.prototype */ 
     
@@ -45,21 +45,25 @@ uki.view.Focusable = new function() {/** @lends uki.view.Focusable.prototype */
         
         if (!preCreatedFocusTarget) {
             this._focusTarget = uki.createElement('input', 'position:absolute;left:-9999px;top:0;width:1px;height:1px;');
+            this._focusTarget.className = 'uki-view-Focusable';
             this.dom().appendChild(this._focusTarget);
         }
         this._hasFocus = false;
         this._firstFocus = true;
             
         uki.dom.bind(this._focusTarget, 'focus', uki.proxy(function(e) {
+            this._stopWatingForBlur();
             if (!this._hasFocus) this._focus(e);
         }, this));
         
         uki.dom.bind(this._focusTarget, 'blur', uki.proxy(function(e) {
             if (this._hasFocus) {
                 this._hasFocus = false;
-                setTimeout(uki.proxy(function() { // wait for mousedown refocusing
-                    if (!this._hasFocus) this._blur();
-                }, this), 1);
+                this._waitingForBlur = 
+                    setTimeout(uki.proxy(function() { // wait for mousedown refocusing
+                        this._waitingForBlur = false;
+                        if (!this._hasFocus) this._blur();
+                    }, this), 1);
             }
         }, this));
         
@@ -78,8 +82,17 @@ uki.view.Focusable = new function() {/** @lends uki.view.Focusable.prototype */
         this._hasFocus = false;
     }
     
+    this._stopWatingForBlur = function() {
+        if (this._waitingForBlur) {
+            clearTimeout(this._waitingForBlur);
+            this._waitingForBlur = false;
+            this._hasFocus = true;
+        }
+    };
+    
     this.focus = function() {
         if (this._focusable && !this._disabled) {
+            this._stopWatingForBlur();
             if (!this._hasFocus) this._focus();
             var target = this._focusTarget;
             setTimeout(function() {

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

@@ -8,6 +8,10 @@ uki.view.Observable = /** @lends uki.view.Observable.prototype */ {
     //     return null; // should implement
     // },
     
+    /**
+     * @param {String} name Event name
+     * @param {function()} callback
+     */
     bind: function(name, callback) {
         callback.huid = callback.huid || uki.guid++;
         uki.each(name.split(' '), function(i, name) {
@@ -18,11 +22,20 @@ uki.view.Observable = /** @lends uki.view.Observable.prototype */ {
     },
     
     unbind: function(name, callback) {
-        uki.each(name.split(' '), function(i, name) {
+        if (!this._observers) return;
+        var names;
+        if (name) {
+            names = name.split(' ');
+        } else {
+            names = [];
+            uki.each(this._observers, function(k, v) { names.push(k) });
+        }
+        uki.each(names, function(i, name) {
             this._observers[name] = !callback ? [] : uki.grep(this._observersFor(name, true), function(observer) {
                 return observer != callback && observer.huid != callback.huid;
             });
             if (this._observers[name].length == 0) {
+                this._observers[name] = undefined;
                 this._unbindFromDom(name);
             }
         }, this);
@@ -43,7 +56,7 @@ uki.view.Observable = /** @lends uki.view.Observable.prototype */ {
     },
     
     _bindToDom: function(name, target) {
-        if (!target && !this.dom) return;
+        if (!target && !this.dom) return false;
         this._domHander = this._domHander || uki.proxy(function(e) {
             e.source = this;
             this.trigger(e.type, e);

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

@@ -33,11 +33,6 @@ uki.view.Styleable = new function() {
     //     };
     // });
     
-    var probe = uki.createElement('div').style;
-    uki.each(['userSelect', 'MozUserSelect', 'WebkitUserSelect'], function(i, name) {
-        if (typeof probe[name] == 'string') this._textSelectProp = name;
-    }, this);
-    
     /**
      * Sets whether text of the view can be selected.
      *
@@ -47,17 +42,15 @@ uki.view.Styleable = new function() {
      * @param {boolean=} state 
      * @returns {boolean|uki.view.Base} current textSelectable state of self
      */
-    this.textSelectable = function(state) {
-        if (state === undefined) return this._textSelectable;
+    this.textSelectable = uki.newProp('_textSelectable', function(state) {
         this._textSelectable = state;
-        if (this._textSelectProp) {
-            this._dom.style[this._textSelectProp] = state ? '' : this._textSelectProp == 'MozUserSelect' ? '-moz-none' : 'none';
+        if (uki.browser.cssUserSelect() != 'unsupported') {
+            this._dom.style[uki.camalize(uki.browser.cssUserSelect())] = (state ? '' : uki.browser.cssUserSelect() == '-moz-user-select' ? '-moz-none' : 'none');
         } else {
             uki.dom[state ? 'unbind' : 'bind'](this.dom(), 'selectstart', uki.dom.preventDefaultHandler);
         }
         this._dom.style.cursor = state ? '' : 'default';
-        return this;
-    };
+    });
     
     this.draggable = function(state) {
         if (state === undefined) return this._dom.getAttribute('draggable');

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

@@ -1,3 +1,5 @@
+include('json.js');
+
 /**
  * based on http://github.com/uki/uki/blob/1.4.2/src/ajax.js
  *
@@ -18,34 +20,6 @@ var jsc = +new Date,
 	
 	
 uki.extend(uki, {
-    error: function( msg ) {
-		throw msg;
-	},
-	
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
- 
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = uki.trim( data );
- 
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
- 
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
- 
-		} else {
-			uki.error( "Invalid JSON: " + data );
-		}
-	},	
-	
 	// Evalulates a script in a global context
 	globalEval: function( data ) {
 		if ( data && rnotwhite.test(data) ) {
@@ -240,7 +214,7 @@ uki.extend(uki, {
 		}
 
 		if ( s.cache === false && type === "GET" ) {
-			var ts = now();
+			var ts = +new Date;
 
 			// try replacing _= if it is there
 			var ret = s.url.replace(rts, "$1_=" + ts + "$2");
@@ -517,7 +491,7 @@ uki.extend(uki, {
 			data = xml ? xhr.responseXML : xhr.responseText;
 
 		if ( xml && data.documentElement.nodeName === "parsererror" ) {
-			uki.error( "parsererror" );
+			throw "parsererror";
 		}
 
 		// Allow a pre-filtering function to sanitize the response