← All changes | js/properties.js +36 -16 2.1.3 → 2.2.2 View file →

		@@ -191,9 +191,9 @@
191	191	// pagelayer-ELPD - Element Properties Dialog
192	192	pagelayer_elpd_html = '<div class="pagelayer-elpd-tabs">'+
193	193	'<div class="pagelayer-elpd-tab" pagelayer-elpd-tab="settings" pagelayer-elpd-active-tab=1>Settings</div>'+
194	194	//'<div class="pagelayer-elpd-tab" pagelayer-elpd-tab="styles">Style</div>'+
195		- '<div class="pagelayer-elpd-tab" pagelayer-elpd-tab="options">Options</div>'+
	195	+ '<div class="pagelayer-elpd-tab" pagelayer-elpd-tab="options">Style</div>'+
196	196	'<div class="pagelayer-advanced-props pagelayer-elpd-tab pagelayer-hidden" pagelayer-elpd-tab="advanced">Advanced</div>'+
197	197	'<div class="pagelayer-elpd-options">'+
198	198	'<i class="pli pli-clone" ></i>'+
199	199	'<i class="pli pli-trashcan" ></i>'+
		@@ -269,8 +269,12 @@
269	269
270	270	// Open the properties
271	271	function pagelayer_elpd_open(jEle){
272	272
	273	+ var el_data = pagelayer_data(jEle);
	274	+ var is_same = (!pagelayer_empty(pagelayer_active.el) && pagelayer_active.el.id === el_data.id);
	275	+ var active_tab = pagelayer_elpd.find('[pagelayer-elpd-active-tab]').attr('pagelayer-elpd-tab');
	276	+
273	277	// Set pagelayer history FALSE
274	278	pagelayer.history_action = false;
275	279
276	280	// Set the position of the element and show
		@@ -280,8 +284,16 @@
280	284	pagelayer.$$('[pagelayer-elpd-tab=settings]').show();
281	285	pagelayer.$$('.pagelayer-elpd-header').show();
282	286	pagelayer.$$('.pagelayer-logo').hide();
283	287
	288	+ // Activate settings tab by default or keep active tab if it's the same element
	289	+ pagelayer_elpd.find('.pagelayer-elpd-tab').removeAttr('pagelayer-elpd-active-tab');
	290	+ if (is_same && active_tab) {
	291	+ pagelayer_elpd.find('[pagelayer-elpd-tab="' + active_tab + '"]').attr('pagelayer-elpd-active-tab', 1);
	292	+ } else {
	293	+ pagelayer_elpd.find('[pagelayer-elpd-tab="settings"]').attr('pagelayer-elpd-active-tab', 1);
	294	+ }
	295	+
284	296	// The property holder
285	297	var holder = pagelayer.$$('.pagelayer-elpd-body');
286	298	holder.html(' ');
287	299
		@@ -298,8 +310,12 @@
298	310
299	311	// Render tooltips for the ELPD
300	312	pagelayer_tooltip_setup();
301	313
	314	+ // Setup instant properties search
	315	+ if (typeof pagelayer_setup_properties_search === 'function') {
	316	+ pagelayer_setup_properties_search();
	317	+ }
302	318	};
303	319
304	320	// Show the properties window
305	321	function pagelayer_elpd_generate(jEle, holder){
		@@ -454,9 +470,12 @@
454	470
455	471	});
456	472
457	473	if(!pagelayer_empty(pagelayer_active_tab) && pagelayer_active_tab.id == el.id){
458		- holder.find('>[section='+pagelayer_active_tab.section+']>.pagelayer-elpd-section-name').click();
	474	+ var target_sec = holder.find('>[section='+pagelayer_active_tab.section+']');
	475	+ if(target_sec.length > 0 && !target_sec.find('.pagelayer-elpd-section-rows').is(':visible')){
	476	+ target_sec.find('.pagelayer-elpd-section-name').click();
	477	+ }
459	478	}
460	479
461	480	// Handle the showing of rows
462	481	pagelayer_elpd_show_rows();
		@@ -1239,13 +1258,8 @@
1239	1258
1240	1259	var imgObj = {};
1241	1260	var isRetina = false;
1242	1261
1243		- // Is retina images options?
1244		- if('retina' in prop && !pagelayer_empty(prop['retina'])){
1245		- isRetina = true;
1246		- }
1247		-
1248	1262	// Previously saved values
1249	1263	if(typeof prop.c['val'] === 'object'){
1250	1264	imgObj = prop.c['val'];
1251	1265	}else{
		@@ -2181,9 +2195,9 @@
2181	2195
2182	2196	row.append(div);
2183	2197
2184	2198	var editor = row.find('.pagelayer-elp-editor');
2185		- editor.val(prop.c['val']);
	2199	+ editor.val(pagelayer_trim(prop.c['val']));
2186	2200
2187	2201	// Handle on change
2188	2202	editor.on('input', function(){
2189	2203	_pagelayer_set_atts(row, pagelayer_trim(jQuery(this).val()));// Save and Render
		@@ -2492,9 +2506,9 @@
2492	2506	'<textarea '+rows+'class="pagelayer-elp-textarea"></textarea>'+
2493	2507	'</div>';
2494	2508
2495	2509	row.append(div);
2496		- row.find('.pagelayer-elp-textarea').val(prop.c['val']);
	2510	+ row.find('.pagelayer-elp-textarea').val(pagelayer_trim(prop.c['val']));
2497	2511
2498	2512	// Handle on change
2499	2513	row.find('.pagelayer-elp-textarea').on('input', function(){
2500	2514	_pagelayer_set_atts(row, pagelayer_trim(jQuery(this).val()));// Save and Render
		@@ -3226,9 +3240,12 @@
3226	3240	row.find('.pagelayer-elp-group-div').first().append(holder);
3227	3241	}
3228	3242
3229	3243	// Setup the toggle
3230		- holder.find('.pagelayer-elp-group-item-title').first().on('click', function(){
	3244	+ holder.find('.pagelayer-elp-group-item-head').first().on('click', function(e){
	3245	+ if(jQuery(e.target).closest('.pagelayer-elp-group-item-clone, .pagelayer-elp-group-item-del, .pagelayer-elp-group-item-drag').length > 0){
	3246	+ return;
	3247	+ }
3231	3248	var rEle = holder.find('.pagelayer-elp-group-item-body').first();
3232	3249	var r_id = holder.attr('pagelayer-group-item-id');
3233	3250
3234	3251	// If the props are not already setup
		@@ -3385,12 +3402,12 @@
3385	3402	}
3386	3403	}
3387	3404
3388	3405	var div = '<div class="pagelayer-elp-padding-div">'+
3389		- '<input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[0])+'"></input>'+
3390		- '<input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[1])+'"></input>'+
3391		- '<input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[2])+'"></input>'+
3392		- '<input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[3])+'"></input>'+
	3406	+ '<div class="pagelayer-elp-padding-inner"><input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[0])+'"></input><span class="pagelayer-elp-padding-lbl">Top</span></div>'+
	3407	+ '<div class="pagelayer-elp-padding-inner"><input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[1])+'"></input><span class="pagelayer-elp-padding-lbl">Right</span></div>'+
	3408	+ '<div class="pagelayer-elp-padding-inner"><input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[2])+'"></input><span class="pagelayer-elp-padding-lbl">Bottom</span></div>'+
	3409	+ '<div class="pagelayer-elp-padding-inner"><input type="number" class="pagelayer-elp-padding" value="'+parseFloat(val[3])+'"></input><span class="pagelayer-elp-padding-lbl">Left</span></div>'+
3393	3410	'<i class="pli pli-link" ></i>'+
3394	3411	'</div>';
3395	3412
3396	3413	row.append(div);
		@@ -3686,9 +3703,9 @@
3686	3703
3687	3704	jQuery.each(val,function(key, value){
3688	3705	div += '<div class="pagelayer-elp-prop-grp pagelayer-elp-filter-'+filters[key][0]+'">'+
3689	3706	'<label class="pagelayer-elp-label">'+filters[key][0]+'</label>'+
3690		- '<input class="pagelayer-elp-slider pagelayer-elp-filter-input" type="range" max="'+filters[key][1]+'" min="0" step="'+filters[key][2]+'" class="pagelayer-elp-filter-'+filters[key][0]+'" value="'+value+'"></input>'+
	3707	+ '<input class="pagelayer-elp-slider pagelayer-elp-filter-input pagelayer-elp-filter-'+filters[key][0]+'" type="range" max="'+filters[key][1]+'" min="0" step="'+filters[key][2]+'" value="'+value+'"></input>'+
3691	3708	'<span class="pagelayer-elp-filter-val">'+value+'</span>'+
3692	3709	'</div>';
3693	3710	});
3694	3711
		@@ -5097,9 +5114,12 @@
5097	5114	// Append to the row
5098	5115	row.find('.pagelayer-elp-menu-items-holder').append(holder);
5099	5116
5100	5117	// Setup the toggle
5101		- holder.find('.pagelayer-elp-group-item-title').first().on('click', function(){
	5118	+ holder.find('.pagelayer-elp-group-item-head').first().on('click', function(e){
	5119	+ if(jQuery(e.target).closest('.pagelayer-elp-group-item-clone, .pagelayer-elp-group-item-del, .pagelayer-elp-group-item-drag').length > 0){
	5120	+ return;
	5121	+ }
5102	5122
5103	5123	var editArea = jEle.find('.pagelayer-mega-editor-'+item['ID']);
5104	5124	var child = editArea.find('[pagelayer-tag="pl_nav_menu_item"]');
5105	5125	var cid;