Revert "Initial commit"

This reverts commit ba3df87.

Author: PixelsCommander

.DS_Store

@@ -1,5 +1,7 @@
 flash.namespace('flash.display.DisplayObject');
 
+
+
 flash.display.DisplayObject = (function(window, undefined){
 	function DisplayObject(DOMObject){
 
@@ -19,21 +21,12 @@ flash.display.DisplayObject = (function(window, undefined){
 		if(DOMObject){
 			var object = $(DOMObject);
 		} else {
-			try{
-				var objectsNumber = flash.stage.objectsNumber;
-			} catch(e){
-				var objectsNumber = -1;	
-			}
-			var object = $('<div/>', {'id': objectsNumber ,'style': 'position: absolute;'});
-			object.id = objectsNumber;
-			var objectsNumber = -1;
+			var object = $('<div/>', {'id': _.uniqueId() ,'style': 'position: absolute;'});
 		}
 
 		object.angleCache = (0);
 		object.scaleXCache = (1);
 		object.scaleYCache = (1);
-		object.xCache = (0);
-		object.yCache = (0);
 		object.childs = [];
 
 		//Listeners initialization
@@ -52,19 +45,20 @@ flash.display.DisplayObject = (function(window, undefined){
 
 		//X, Y  getters / setters
 		objGetSet.xGet = function(){
-			return parseInt(this[0].style['left']);
+			return parseInt(this.css('left'));
 		}
 		objGetSet.xSet = function(x){
-			this[0].style['left']= flash.utils.numToPx(x);
+			this.css('left', flash.utils.numToPx(x));
 			if (flash.stage != undefined && this === flash.stage.cameraTarget){
 				flash.stage.x = (-x + flash.stage.width * 0.5) * flash.stage.scaleX;
 			}
 		}
 		objGetSet.yGet = function(){
-			return parseInt(this[0].style['top']);
+			return parseInt(this.css('top'));
 		}
 		objGetSet.ySet = function(y){
-			this[0].style['top'] = flash.utils.numToPx(y);
+			//console.log("top" + this.css('top'));
+			this.css('top', flash.utils.numToPx(y));
 			if (flash.stage != undefined && this === flash.stage.cameraTarget){
 				flash.stage.y = (-y + flash.stage.height * 0.5) * flash.stage.scaleY;
 			}
@@ -97,33 +91,33 @@ flash.display.DisplayObject = (function(window, undefined){
 
 		//Opacity
 		objGetSet.alphaGet = function(){
-			return this[0].style['opacity'] * 100;
+			return this.css('opacity') * 100;
 		}
 		objGetSet.alphaSet = function(x){
-			this[0].style['opacity'] = x / 100;
+			this.css('opacity', x / 100);
 		}
 
 		//Fill color
 		objGetSet.fillColorGet = function(){
-			return this[0].style['backgroundColor'];
+			return this.css('background-color');
 		}
 		objGetSet.fillColorSet = function(x){
-			this[0].style['backgroundColor'] = x;
+			this.css('background-color', x);
 		}
 
 		//Visible
 		objGetSet.visibleGet = function(){
-			if (this[0].style['display'] === 'none'){
+			if (this.css('display') === 'none'){
 				return false;
 			} else {
 				return true;
 			}
 		}
 		objGetSet.visibleSet = function(x){
 			if (x === true){
-				this[0].style['display'] = 'inline';
+				this.css('display', 'inline');
 			} else {
-				this[0].style['display'] = 'none';
+				this.css('display', 'none');
 			}
 		}
 
@@ -147,51 +141,6 @@ flash.display.DisplayObject = (function(window, undefined){
 			this.refreshCSSTransform();
 		}
 
-		objGetSet.setMask = function(displayObject){
-			if (displayObject === undefined){
-				this.maskObject.isMask = false;
-				this.maskObject = undefined;
-				return;
-			}
-			
-			this.maskObject = displayObject;
-			this.maskObject.isMask = true;
-			
-			if (this.maskObject._graphics === undefined) return;
-			
-			var dataurl = this.maskObject._graphics.canvas.toDataURL();	
-			
-			if ((this.dataurl && this.dataurl.length !== dataurl.length) || this.dataurl === undefined) {
-			
-				this[0].style['-webkit-mask-box-image'] = 'url(' + dataurl + ')';
-				this.dataurl = dataurl;
-			/*
-				if (this.tempstyle1 === undefined) {
-					if (this.tempstyle2 !== undefined) {
-						this.tempstyle2.remove();
-						this.tempstyle2 = undefined;
-					}
-					this.tempstyle1 = $("<style type='text/css'> .tempstyle1{ -webkit-mask-box-image:" + 'url(' + dataurl + ')' + ";} </style>").appendTo("head");
-					this.className = 'tempstyle1';
-				} else {
-					this.tempstyle1.remove();
-					this.tempstyle1 = undefined;
-					this.tempstyle2 = $("<style type='text/css'> .tempstyle2{ -webkit-mask-box-image:" + 'url(' + dataurl + ')' + ";} </style>").appendTo("head");
-					this.className = 'tempstyle2';
-				}
-				
-			 */
-			}
-		}
-		
-		
-		
-		objGetSet.getMask = function(){
-			return this.maskObject;
-		}
-		
-		//Mask
-		defineGetterSetter(object, "mask", objGetSet.getMask, objGetSet.setMask);
 
 		//numChildren getter
 		defineGetterSetter(object, "numChildren", objGetSet.numChildrenGet, function(x){});
@@ -220,16 +169,6 @@ flash.display.DisplayObject = (function(window, undefined){
 		defineGetterSetter(object, "scaleX", objGetSet.scaleXGet, objGetSet.scaleXSet);
 		defineGetterSetter(object, "scaleY", objGetSet.scaleYGet, objGetSet.scaleYSet);
 
-		//Graphics
-		// Visible
-		defineGetterSetter(object, "graphics", function(){
-			if (this._graphics === undefined){
-				return flash.display.Graphics(this);
-			} else {
-				return this._graphics;
-			}
-		}, function (x){});
-		
 		//CSS transform refresh function to update rotation, scale and potentially skew
 		object.refreshCSSTransform = function(){
 			flash.display.cssTransformFunction.call(this, this.angleCache, this.scaleXCache, this.scaleYCache);	
@@ -280,9 +219,6 @@ flash.display.DisplayObject = (function(window, undefined){
 		}
 
 		object.addEventListener = object.bind;
-		object.dispatchEvent = function (eventObject){
-			object.trigger(eventObject.type);
-		}
 
 		object.x = 0;
 		object.y = 0;

045inprogress.zip

@@ -6,24 +6,10 @@ flash.events.Event = {
 	RESIZE : 'resize'
 }
 
-flash.events.IOErrorEvent = {
-	IO_ERROR : 'ioerror'
-}
-
-flash.events.LoadingManagerEvent = {
-	ALL_COMPLETED : 'allcompleted',
-	HAVE_ACTIVE : 'haveactive'	
-}
-
 flash.namespace('flash.events.MouseEvent');
 
 flash.events.MouseEvent = {
-	CLICK : "click",
-	MOUSE_MOVE : "mousemove",
-	MOUSE_DOWN : "mousedown",
-	MOUSE_UP : "mouseup",
-	MOUSE_OUT : "mouseout",
- 	MOUSE_OVER : "mouseover"
+	CLICK : "click"
 }
 
 flash.events.KeyboardEvent = {
@@ -36,20 +22,7 @@ flash.events.KeyboardEvent = {
 	SPACEBAR_CODE : 32
 }
 
-function jqMouseEventToFlashMouseEvent(e){
-	e.localX = e.clientX;
-	e.localY = e.clientY;
-	e.stageX = flash.stage.mouseX;
-	e.stageY = flash.stage.mouseY;
-	e.delta = wheelDelta;
-}
-
-IOErrorEvent = flash.events.IOErrorEvent;
-LoadingManagerEvent = flash.events.LoadingManagerEvent;
-
 flash.extend(window.Event, flash.events.Event);
-flash.extend(window.IOErrorEvent, flash.events.IOErrorEvent);
-flash.extend(window.LoadingManagerEvent, flash.events.LoadingManagerEvent);
 flash.extend(window.MouseEvent, flash.events.MouseEvent);
 flash.extend(window.KeyboardEvent, flash.events.KeyboardEvent);