Changeset 234 for ether_megapoli/trunk/web/resources/js

Timestamp:

10/26/11 17:22:50 (13 years ago)

Author:

vmipsl

Message:

Look apple

Location:

ether_megapoli/trunk/web/resources/js

Files:

• classesForJQuery/Button.js (copied) (copied from ether_megapoli/trunk/web/resources/js/classesForPrototype/Button.js) (8 diffs)
• classesForJQuery/ComplexButton.js (modified) (1 diff)
• classesForJQuery/Loading.js (copied) (copied from ether_megapoli/trunk/web/resources/js/Loading.js) (4 diffs)
• classesForJQuery/Select.js (added)
• classesForJQuery/etherClasses.js (moved) (moved from ether_megapoli/trunk/web/resources/js/etherClasses.js) (12 diffs)
• classesForJQuery/etherHelper.js (added)
• classesForPrototype/Loading.js (moved) (moved from ether_megapoli/trunk/web/resources/js/Loading.js)
• classesForPrototype/Request.js (moved) (moved from ether_megapoli/trunk/web/resources/js/Request.js)
• classesForPrototype/Select.js (moved) (moved from ether_megapoli/trunk/web/resources/js/Select.js)
• classesForPrototype/etherClasses.js (copied) (copied from ether_megapoli/trunk/web/resources/js/etherClasses.js) (2 diffs)
• classesForPrototype/etherHelper.js (moved) (moved from ether_megapoli/trunk/web/resources/js/etherHelper.js)

ether_megapoli/trunk/web/resources/js/classesForJQuery/Button.js

@@ -3 +3 @@
 // Display a button
 //
+// use JQuery
 // str value: Value to display in the button
 // dom parent: in which dom element to draw the button
@@ -31 +32 @@
         if( this.className )
             this.divContainer.className = this.className;
-        this.divContainer.atMe = this;
-        this.divContainer.id = this.id;
+        this.divContainer.attr( {id:this.id} );
         if( this.parent )
-            this.parent.appendChild( this.divContainer );
+            this.parent.append( this.divContainer );
 
         this.divText = $( document.createElement( "div" ) );
         if( this.classNameText )
             this.divText.className = "button_text";
-        this.divText.innerHTML = this.value;
-        this.divContainer.appendChild( this.divText );
+        this.divText.html( this.value );
+        this.divContainer.append( this.divText );
 
         // Define button events
-        Event.observe( this.divContainer, 'click', this.onClick.bindAsEventListener( this ) );
-        Event.observe( this.divContainer, 'mouseover', this.onHover.bindAsEventListener( this ) );
-        Event.observe( this.divContainer, 'mouseout', this.onOut.bindAsEventListener( this ) );
+        this.divContainer.bind( 'click', this, this.onClick );
+        this.divContainer.bind( 'mouseover', this, this.onHover );
+        this.divContainer.bind( 'mouseout', this, this.onOut );
     },
 
@@ -68 +68 @@
     {
         this.value = value;
-        this.divText.innerHTML = this.value;
+        this.divText.html( this.value );
     },
 
@@ -77 +77 @@
 
     // Actions ********************************************************
-
     disable : function()
     {
         this.boolDisabled = true;
-        this.divContainer.addClassName( "disable" );
+        this.divContainer.addClass( "disable" );
     },
 
@@ -87 +86 @@
     {
         this.boolDisabled = false;
-        this.divContainer.removeClassName( "disable" );
+        this.divContainer.removeClass( "disable" );
     },
 
@@ -94 +93 @@
         this.boolSelected = value;
         if( this.boolSelected )
-            this.divContainer.addClassName( "selected" );
+            this.divContainer.addClass( "selected" );
         else
-            this.divContainer.removeClassName( "selected" );
+            this.divContainer.removeClass( "selected" );
     },
 
@@ -102 +101 @@
     {
         this.boolDisplayed = true;
-        this.divContainer.style.display = "";
+        this.divContainer.show();
     },
 
@@ -108 +107 @@
     {
         this.boolDisplayed = false;
-        this.divContainer.style.display = "none";
+        this.divContainer.hide();
     },
 
     // Events ********************************************************
-
     onClick : function( event )
     {
-        if( !this.isDisable() && (undefined == event.detail || 1 == event.detail) )
-        {
-            if( this.callbackOnClick )
-                this.callbackOnClick();
-        }
-        Event.stop( event );
+        var contextButton = event.data;
+        if( !contextButton.isDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
+            contextButton.callbackOnClick();
     },
 
     onHover : function( event )
     {
-        if( !this.isDisable() && this.callbackOnMouseOver )
-            this.callbackOnMouseOver();
-
-        Event.stop( event );
+        var contextButton = event.data;
+        if( !contextButton.isDisable() && contextButton.callbackOnMouseOver )
+            contextButton.callbackOnMouseOver();
     },
 
-    onOut: function()
+    onOut: function( event )
     {
-        if( !this.isDisable() && this.callbackOnMouseOut )
-            this.callbackOnMouseOut();
+        var contextButton = event.data;
+        if( !contextButton.isDisable() && contextButton.callbackOnMouseOut )
+            contextButton.callbackOnMouseOut();
     }
 } );

ether_megapoli/trunk/web/resources/js/classesForJQuery/ComplexButton.js

@@ -152 +152 @@
     onClick : function( event )
     {
-        var contextButton = event.data;
-        if( !contextButton.getDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
-            contextButton.callbackOnClick();
+        var contextEvent = event.data;
+        if( !contextEvent.getDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
+            contextEvent.callbackOnClick();
     }
 } );

ether_megapoli/trunk/web/resources/js/classesForJQuery/Loading.js

@@ -1 +1 @@
 //******************************************************************************
 // Loading interface
+//
+// use JQuery
 // parameters :
 // parent : specify the parent of loading component
@@ -6 +8 @@
 //******************************************************************************
 
-var Loading = Class.create({
+var Loading = Class.create( {
 
     initialize:function( parameters )
@@ -15 +17 @@
 
         //Create loading component
-        this.loadingDiv = document.createElement("div");
-        this.loadingDiv.id = this.id;
-        this.loadingDiv.className = "loading-classic";
-        this.parent.appendChild(this.loadingDiv);
+        this.loadingDiv = $( document.createElement( "div" ) );
+        this.loadingDiv.attr( {id:this.id, class:"loading-classic"} );
+        this.parent.append( this.loadingDiv );
         this.hide();
     } ,
@@ -24 +25 @@
     display:function()
     {
-        this.loadingDiv.style.display = "";
+        this.loadingDiv.show();
     },
 
     hide:function()
     {
-        this.loadingDiv.style.display = "none";
+        this.loadingDiv.hide();
     }
-}) ;
+} );

ether_megapoli/trunk/web/resources/js/classesForJQuery/etherClasses.js

@@ -6 +6 @@
     initialize: function( plateforms, objectParameter )
     {
-        this.array = $A();
-        $A( plateforms ).each( function( jsonObject )
-        {
-            this.addItem( jsonObject, objectParameter );
-        }.bind( this ) );
+        this.array = [];
+        jQuery.each( plateforms,
+                jQuery.proxy( function( i, jsonObject )
+                {
+                    this.addItem( jsonObject, objectParameter );
+                }, this ) );
     },
 
@@ -31 +32 @@
     addOpenListener : function( func )
     {
-        this.array.each( function( objectItem )
+        jQuery.each( this.array, function( i, objectItem )
         {
             objectItem.divItem.addOpenListener( func );
@@ -44 +45 @@
             divNoItem.id = idIfNoItem;
             divNoItem.textContent = textIfNoItem;
-            parentNode.appendChild( divNoItem );
+            parentNode.append( divNoItem );
         }
         else
-            this.array.each( function( item )
+            jQuery.each( this.array, function( item )
             {
                 item.divItem.display( parentNode );
@@ -55 +56 @@
     displayWithPairImpair : function( parentNode, idIfNoItem, textIfNoItem )
     {
-        Dom.clearContainer( parentNode );
-        if( 0 >= this.array.size() )
+        parentNode.empty();
+//        Dom.clearContainer( parentNode );
+        if( 0 >= this.array.length )
         {
             var divNoItem = $( document.createElement( "div" ) );
             divNoItem.id = idIfNoItem;
             divNoItem.textContent = textIfNoItem;
-            parentNode.appendChild( divNoItem );
+            parentNode.append( divNoItem );
         }
         else
         {
             var rowNumber = 0;
-            this.array.each( function( item )
+            jQuery.each( this.array, function( i, item )
             {
                 if( rowNumber % 2 == 0 )
@@ -80 +82 @@
     {
         var returnObj = false;
-        this.array.each( function( objItem )
+        jQuery.each( this.array, jQuery.proxy( function( i, objItem )
         {
             if( objItem.jsonElement.id == itemId )
                 returnObj = objItem;
-        }.bind( this ) );
+        }, this ) );
 
         return returnObj;
@@ -98 +100 @@
     initialize: function( jsonElement, objectParameter )
     {
-        this.jsonElement = Object.clone( jsonElement ); // Warning: This is only a shallow copy
-        this.listeners = $A();
-
-        // HACK: No deep copy in Javascript
+        this.jsonElement = jsonElement;
+        this.listeners = [];
+
         if( objectParameter )
         {
             this.language = objectParameter.language || "fr";
-            if( objectParameter.currentTitleId )
-                this.currentTitleId = objectParameter.currentTitleId;
-            if( objectParameter.isExpiredTitle )
-                this.isExpiredTitle = objectParameter.isExpiredTitle;
             this.onMouseOverContainer = objectParameter.onMouseOverContainer ? objectParameter.onMouseOverContainer : false;
             this.onMouseOutContainer = objectParameter.onMouseOutContainer ? objectParameter.onMouseOutContainer : false;
@@ -129 +126 @@
         this.divContainer.item = this;
         if( classNameValue )
-            this.divContainer.className = classNameValue;
-        this.divContainer.id = containerName + "_" + this.jsonElement.id;
+            this.divContainer.addClass( classNameValue );
+        this.divContainer.attr( {id:containerName + "_" + this.jsonElement.id} );
     },
 
@@ -136 +133 @@
     {
         this.parentNode = parentNode;
-        parentNode.appendChild( this.divContainer );
+        parentNode.append( this.divContainer );
     },
 
     onHoverContainer: function( event )
     {
+        var contextEvent = event.data;
         if( !event || (event.detail == undefined || 1 == event.detail) )
-            this.executeListenersFunction();
+            contextEvent.executeListenersFunction();
     },
 
     onClickContainer: function( event )
     {
+        var contextEvent = event.data;
         if( !event || (event.detail == undefined || 1 == event.detail) )
-            this.executeListenersFunction();
+            contextEvent.executeListenersFunction();
     },
 
@@ -154 +153 @@
     {
         if( classNameValue )
-            this.divContainer.addClassName( classNameValue );
+            this.divContainer.addClass( classNameValue );
     },
 
@@ -160 +159 @@
     {
         if( classNameValue )
-            this.divContainer.removeClassName( classNameValue );
+            this.divContainer.removeClass( classNameValue );
     },
 
     executeListenersFunction: function()
     {
-        this.listeners.each( function ( func )
+        jQuery.each( this.listeners, jQuery.proxy( function ( i, func )
         {
             func( this );
-        }.bind( this ) );
+        }, this ) );
     },
 
@@ -174 +173 @@
     {
         if( this.divContainer )
-            Event.observe( this.divContainer, 'click', this.onClickContainer.bindAsEventListener( this ) );
+            this.divContainer.bind( 'click', this, this.onClickContainer );
         if( this.divContainer && this.onMouseOverContainer )
-            Event.observe( this.divContainer, 'mouseover', this.onMouseOverContainer.bindAsEventListener( this ) );
+            this.divContainer.bind( 'mouseover', this, this.onMouseOverContainer );
         if( this.divContainer && this.onMouseOutContainer )
-            Event.observe( this.divContainer, 'mouseout', this.onMouseOutContainer.bindAsEventListener( this ) );
+            this.divContainer.bind( 'mouseout', this, this.onMouseOutContainer );
     },
 
@@ -192 +191 @@
 
         this.divName = $( document.createElement( "div" ) );
-        this.divName.className = classNameValue;
-        this.divName.innerHTML = this.jsonElement.name;
-
-        this.divContainer.appendChild( this.divName );
+        this.divName.addClass( classNameValue );
+        this.divName.html( this.jsonElement.name );
+
+        this.divContainer.append( this.divName );
     },
 

ether_megapoli/trunk/web/resources/js/classesForPrototype/etherClasses.js

@@ -6 +6 @@
     initialize: function( plateforms, objectParameter )
     {
-        this.array = $A();
+        this.array = $A("");
         $A( plateforms ).each( function( jsonObject )
         {
@@ -99 +99 @@
     {
         this.jsonElement = Object.clone( jsonElement ); // Warning: This is only a shallow copy
-        this.listeners = $A();
+        this.listeners = $A("");
 
         // HACK: No deep copy in Javascript