Changeset 7910 for extensions
- Timestamp:
- Nov 28, 2010, 3:23:06 PM (13 years ago)
- Location:
- extensions/cl_conflit
- Files:
-
- 1 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/cl_conflit/js/conflit.js
r7903 r7910 181 181 p0 = jQuery(Parent); 182 182 if (p0.length > 0) { 183 183 184 //====================================================== 184 185 if (theme.match("gally", "gi")) -
extensions/cl_conflit/js/jquery.dimensions.js
r7904 r7910 14 14 */ 15 15 (function (jQuery) { 16 jQuery.dimensions = { cl_ version: '1.3' };16 jQuery.dimensions = { cl_dimensions_version: '1.3' }; 17 17 /* 18 18 * Interception Height, Width … … 31 31 var torl = name == 'Height' ? 'Top' : 'Left', 32 32 borr = name == 'Height' ? 'Bottom' : 'Right'; 33 options = jQuery.extend({ margin: false }, 34 options || {}); 33 options = options || false; 34 options = jQuery.extend({ margin: options } ); 35 35 36 var val = this.is(':visible') ? this[0]['offset' + name] : 36 37 num(this, … … 39 40 num(this, 'border' + borr + 'Width') + 40 41 num(this, 'padding' + torl) + 41 num(this, 'padding' + borr); 42 num(this, 'padding' + borr) 43 44 ; 42 45 return val + (options.margin ? (num(this, 'margin' + torl) + num(this, 'margin' + borr)) : 0); 43 46 }; -
extensions/cl_conflit/main.inc.php
r7905 r7910 2 2 /* 3 3 Plugin Name: cl_conflit 4 Version: 1.0. 14 Version: 1.0.2 5 5 Description: gestion des conflits entre jQuery et les autres librairies 6 6 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=474
Note: See TracChangeset
for help on using the changeset viewer.