Rename ui-scope variables, so their names don't clash

Author: rxaviers

ui/jquery.ui.core.js

@@ -18,7 +18,7 @@
 	}
 }(function( $ ) {
 
-var uuid = 0,
+var coreUuid = 0,
 	runiqueId = /^ui-id-\d+$/;
 
 // $.ui might exist from components with no dependencies, e.g., $.ui.position
@@ -83,7 +83,7 @@ $.fn.extend({
 	uniqueId: function() {
 		return this.each(function() {
 			if ( !this.id ) {
-				this.id = "ui-id-" + (++uuid);
+				this.id = "ui-id-" + (++coreUuid);
 			}
 		});
 	},

ui/jquery.ui.droppable.js

@@ -30,7 +30,7 @@
 	}
 }(function( $ ) {
 
-function isOverAxis( x, reference, size ) {
+function droppableIsOverAxis( x, reference, size ) {
 	return ( x >= reference ) && ( x < ( reference + size ) );
 }
 
@@ -245,7 +245,7 @@ $.ui.intersect = function( draggable, droppable, toleranceMode ) {
 		case "pointer":
 			draggableLeft = ( ( draggable.positionAbs || draggable.position.absolute ).left + ( draggable.clickOffset || draggable.offset.click ).left );
 			draggableTop = ( ( draggable.positionAbs || draggable.position.absolute ).top + ( draggable.clickOffset || draggable.offset.click ).top );
-			return isOverAxis( draggableTop, t, droppable.proportions().height ) && isOverAxis( draggableLeft, l, droppable.proportions().width );
+			return droppableIsOverAxis( draggableTop, t, droppable.proportions().height ) && droppableIsOverAxis( draggableLeft, l, droppable.proportions().width );
 		case "touch":
 			return (
 				( y1 >= t && y1 <= b ) || // Top edge touching

ui/jquery.ui.effect-blind.js

@@ -24,7 +24,7 @@
 	}
 }(function( $ ) {
 
-var rvertical = /up|down|vertical/,
+var blindRVertical = /up|down|vertical/,
 	rpositivemotion = /up|left|vertical|horizontal/;
 
 $.effects.effect.blind = function( o, done ) {
@@ -33,7 +33,7 @@ $.effects.effect.blind = function( o, done ) {
 		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
 		mode = $.effects.setMode( el, o.mode || "hide" ),
 		direction = o.direction || "up",
-		vertical = rvertical.test( direction ),
+		vertical = blindRVertical.test( direction ),
 		ref = vertical ? "height" : "width",
 		ref2 = vertical ? "top" : "left",
 		motion = rpositivemotion.test( direction ),

ui/jquery.ui.position.js

@@ -24,8 +24,8 @@ var cachedScrollbarWidth,
 	max = Math.max,
 	abs = Math.abs,
 	round = Math.round,
-	rhorizontal = /left|center|right/,
-	rvertical = /top|center|bottom/,
+	positionRHorizontal = /left|center|right/,
+	positionRVertical = /top|center|bottom/,
 	roffset = /[\+\-]\d+(\.[\d]+)?%?/,
 	rposition = /^\w+/,
 	rpercent = /%$/,
@@ -156,14 +156,14 @@ $.fn.position = function( options ) {
 			verticalOffset;
 
 		if ( pos.length === 1) {
-			pos = rhorizontal.test( pos[ 0 ] ) ?
+			pos = positionRHorizontal.test( pos[ 0 ] ) ?
 				pos.concat( [ "center" ] ) :
-				rvertical.test( pos[ 0 ] ) ?
+				positionRVertical.test( pos[ 0 ] ) ?
 					[ "center" ].concat( pos ) :
 					[ "center", "center" ];
 		}
-		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
-		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+		pos[ 0 ] = positionRHorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+		pos[ 1 ] = positionRVertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
 
 		// calculate offsets
 		horizontalOffset = roffset.exec( pos[ 0 ] );

ui/jquery.ui.sortable.js

@@ -28,7 +28,7 @@
 	}
 }(function( $ ) {
 
-function isOverAxis( x, reference, size ) {
+function sortableIsOverAxis( x, reference, size ) {
 	return ( x >= reference ) && ( x < ( reference + size ) );
 }
 
@@ -567,8 +567,8 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 	_intersectsWithPointer: function(item) {
 
-		var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
-			isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+		var isOverElementHeight = (this.options.axis === "x") || sortableIsOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = (this.options.axis === "y") || sortableIsOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
 			isOverElement = isOverElementHeight && isOverElementWidth,
 			verticalDirection = this._getDragVerticalDirection(),
 			horizontalDirection = this._getDragHorizontalDirection();
@@ -585,8 +585,8 @@ $.widget("ui.sortable", $.ui.mouse, {
 
 	_intersectsWithSides: function(item) {
 
-		var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
-			isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+		var isOverBottomHalf = sortableIsOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = sortableIsOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
 			verticalDirection = this._getDragVerticalDirection(),
 			horizontalDirection = this._getDragHorizontalDirection();
 
@@ -870,7 +870,7 @@ $.widget("ui.sortable", $.ui.mouse, {
 				if(this.items[j].item[0] === this.currentItem[0]) {
 					continue;
 				}
-				if (floating && !isOverAxis(this.positionAbs.top + this.offset.click.top, this.items[j].top, this.items[j].height)) {
+				if (floating && !sortableIsOverAxis(this.positionAbs.top + this.offset.click.top, this.items[j].top, this.items[j].height)) {
 					continue;
 				}
 				cur = this.items[j].item.offset()[posProperty];

ui/jquery.ui.widget.js

@@ -18,7 +18,7 @@
 	}
 }(function( $ ) {
 
-var uuid = 0,
+var widgetUuid = 0,
 	slice = Array.prototype.slice,
 	_cleanData = $.cleanData;
 $.cleanData = function( elems ) {
@@ -236,7 +236,7 @@ $.Widget.prototype = {
 	_createWidget: function( options, element ) {
 		element = $( element || this.defaultElement || this )[ 0 ];
 		this.element = $( element );
-		this.uuid = uuid++;
+		this.uuid = widgetUuid++;
 		this.eventNamespace = "." + this.widgetName + this.uuid;
 		this.options = $.widget.extend( {},
 			this.options,