Merge branch 'master' of github.com:enyojs/enyo

source/boot/loader.js

@@ -33,18 +33,7 @@
 				result = result.replace(this.rewritePattern, fn);
 			} while (working);
 			return result;
-		}/*,
-		unwrite: function(inPath) {
-			for (var n in this.paths) {
-				var p = this.paths[n] || '';
-				var l = p.length;
-				// if inPath is rooted at path p, replace that path with n (p's alias)
-				if (inPath.slice(0, l) == p) {
-					return "$" + n + inPath.slice(l);
-				}
-			}
-			return inPath;
-		}*/
+		}
 	};
 
 	enyo.loaderFactory = function(inMachine) {
@@ -236,25 +225,6 @@
 				}
 				//
 				alias = parts.join("-");
-				/*
-				alias = parts.join("/");
-				//
-				// remove $enyo, $lib prefixi
-				//
-				//	e.g. $enyo/knob -> knob package
-				//	e.g. $lib/flarn -> flarn package
-				var deprefix = function(prefix) {
-					if (alias.slice(0, prefix.length) == prefix) {
-						alias = alias.slice(prefix.length + 1); // assumes a trailing slash
-					}
-				};
-				var p$ = enyo.path.paths;
-				deprefix(p$.enyo);
-				//deprefix(p$.lib);
-				//
-				// use "-" delimiter instead of "/" for aliasing
-				alias = alias.replace(/\//g, "-");
-				*/
 			}
 			return {
 				alias: alias,

source/kernel/UiComponent.js

@@ -119,10 +119,10 @@ enyo.kind({
 	indexOfClientControl: function(inControl) {
 		return enyo.indexOf(inControl, this.getClientControls());
 	},
-	getControlIndex: function() {
+	indexInContainer: function() {
 		return this.container.indexOfControl(this);
 	},
-	getClientIndex: function() {
+	clientIndexInContainer: function() {
 		return this.container.indexOfClientControl(this);
 	},
 	// children

source/scroll/Scroller.js

@@ -68,7 +68,7 @@ enyo.kind({
 			var ua = navigator.userAgent;
 			for (var i=0, t, m; t=this.osInfo[i]; i++) {
 				if (this.calcOsVersion(ua, t.os) < t.version) {
-					return true;
+					return false;
 				}
 			}
 			return true;

tools/minify.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# the folder this script is in (*/enyo/tools)
+TOOLS=$(cd `dirname $0`; pwd)
+# enyo location
+ENYO=$TOOLS/..
+# minify script location
+MINIFY=$TOOLS/minifier/minify.js
+
+# check for node, but quietly
+if command -v node >/dev/null 2>&1; then
+	# use node to invoke minify with a known path to enyo and imported parameters
+	node $MINIFY -enyo $ENYO $@
+else
+	echo "No node found in path"
+	exit 1
+fi