Changeset 767 for tapas/web/resources/js/classesForJQuery

Timestamp:

04/25/13 12:22:14 (11 years ago)

Author:

rboipsl

Message:

V2 ajout infobulles + textes

Location:

tapas/web/resources/js/classesForJQuery

Files:

• LoginButton.js (modified) (1 diff)
• Select.js (modified) (15 diffs)
• Select.js_copy (copied) (copied from tapas/web/resources/js/classesForJQuery/Select.js)

tapas/web/resources/js/classesForJQuery/LoginButton.js

@@ -228 +228 @@
     {
         this.errors = jQuery.parseJSON( result ).errors;
-        this.setJSONUser( null != jQuery.parseJSON( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false );
+        this.setJSONUser( null != jQuery.parseJSOetherN( result ).jSONUser ? jQuery.parseJSON( result ).jSONUser : false );
         if( null == this.errors )
             this.updateLoginOrLogout();

tapas/web/resources/js/classesForJQuery/Select.js

@@ -39 +39 @@
         this.isHover = false;
         this.arrayOptions = $();
-        this.values = $();
         this.className = objectParameter.className ? "select_container " + objectParameter.className : "select_container";
         this.classNameOption = objectParameter.classNameOption ? "select_choicelist " + objectParameter.classNameOption : "select_choicelist";
+//                this.callbackSelect = objectParameter.callbackSelect ? objectParameter.callbackSelect : false;
+
+        // Variables
+        this.itemValues = $();
 
         // Select div
         this.divSelect = $( document.createElement( "div" ) );
-        this.divSelect.attr( {id:this.id, class:this.className } );
+        this.divSelect.attr( {id:this.id, class:this.className} );
 
         this.divSelectLeft = $( document.createElement( "div" ) )
@@ -65 +68 @@
         this.divOption.addClass( this.classNameOption );
         this.parent.append( this.divOption );
+
+        //rajout pour onclick
+//                if(this.callbackSelect)
+//                    this.divSelect.bind( 'click', this, this.onClickSelect );
 
         this.divSelect.bind( "mouseup", this, this.toggleOption );
@@ -71 +78 @@
         this.divOption.bind( 'mouseover', this, this.onMouseHover );
         this.divOption.bind( 'mouseout', this, this.onMouseOut );
+        this.parent.bind( 'mouseleave', this, this.onMouseParentOut );
 
         if( this.isDisplayed )
@@ -89 +97 @@
     },
 
+    getValue2: function()
+    {
+        return this.itemValue2;
+    },
+
     getValues: function()
     {
-        return this.values;
+        return this.itemValues;
     },
 
     getValuesInString: function( separator )
     {
-        var valulues = $.makeArray( this.values );
+        var valulues = $.makeArray( this.itemValues );
         if( separator )
             return valulues.join( separator );
@@ -148 +161 @@
         this.divSelect.addClass( "disable" );
         this.hideOption();
+        /* Nath*/
+        this.divSelectMiddle.removeClass( "select_selectMiddle" );
+        this.divSelectMiddle.addClass( "select_selectMiddle_disable" );
     },
 
@@ -155 +171 @@
         this.isDisable = false;
         this.divSelect.removeClass( "disable" );
+        /* Nath*/
+        this.divSelectMiddle.removeClass( "select_selectMiddle_disable" );
+        this.divSelectMiddle.addClass( "select_selectMiddle" );
     },
 
@@ -176 +195 @@
 
     // public
-    add: function( itemValue, itemName, callback )
+    add: function( itemValue, itemName, callback, itemValue2 )
     {
         var divOptionMiddle = $( document.createElement( "div" ) );
@@ -183 +202 @@
         divOptionMiddle.itemName = itemName;
         divOptionMiddle.itemValue = itemValue;
+        if( itemValue2 )
+            divOptionMiddle.itemValue2 = itemValue2;
         divOptionMiddle.callback = callback;
         this.divOption.append( divOptionMiddle );
@@ -189 +210 @@
 
         this.arrayOptions.push( divOptionMiddle );
-        this.values.push( itemValue );
+        this.itemValues.push( itemValue );
     },
 
@@ -202 +223 @@
                 var index = jQuery.inArray( divOption, this.arrayOptions );
                 this.arrayOptions.splice( index, 1 );
-                this.values.splice( index, 1 );
+                this.itemValues.splice( index, 1 );
                 return false;
             }
@@ -213 +234 @@
         this.divOption.empty();
         this.arrayOptions = $();
-        this.values = $();
+        this.itemValues = $();
     },
 
@@ -265 +286 @@
         this.itemName = divOption.itemName;
         this.itemValue = divOption.itemValue;
+        this.itemValue2 = divOption.itemValue2;
         this.divSelectMiddle.html( this.itemName );
     },
@@ -276 +298 @@
         contextEvent.hideOption();
         contextEvent.select( divOption.itemValue, true );
-        if( undefined != divOption.callback )
-            divOption.callback( divOption.itemValue );
     },
 
@@ -287 +307 @@
 
     // private
+    onMouseParentOut: function( event )
+    {
+        event.data.isHover = false;
+        event.data.hideOption();
+    },
+
     onMouseOut: function( event )
     {
@@ -307 +333 @@
         }
     }
+
+//            onClickSelect: function()
+//            {
+//                this.callbackSelect();
+//            }
 } );