← All changes | js/library.js +64 -6 3.0.7 → 3.7.9 View file →

		@@ -1,5 +1,7 @@
1	1	/* global visualizer */
	2	+/* global alert */
	3	+
2	4	(function (wpmv) {
3	5	var vm, vmv;
4	6
5	7	vm = visualizer.media = {};
		@@ -20,9 +22,13 @@
20	22	self.createIframeStates();
21	23	},
22	24
23	25	open: function () {
24		- wpmv.MediaFrame.prototype.open.apply(this, arguments);
	26	+ try{
	27	+ wpmv.MediaFrame.prototype.open.apply(this, arguments);
	28	+ }catch(error){
	29	+ alert(visualizer.i10n.conflict);
	30	+ }
25	31	this.$el.addClass('hide-menu');
26	32	}
27	33	});
28	34	})(wp.media.view);
		@@ -35,9 +41,17 @@
35	41	var width = $('#visualizer-library').width(),
36	42	margin = width * 0.02;
37	43
38	44	width *= 0.305;
39		- $(this).width(width - 14).height(width * 0.75).parent().css('margin-right', margin + 'px').css('margin-bottom', margin + 'px');
	45	+ $(this).prev( '.visualizer-chart-title' ).width(width - 14);
	46	+ var ChartHeight = width * 0.93;
	47	+ if ( $( '.visualizer-nochart-canvas' ).length === 0 ) {
	48	+ ChartHeight = width * 0.78;
	49	+ if ( $( '#visualizer-sidebar' ).hasClass('one-columns') ) {
	50	+ ChartHeight = width * 0.92;
	51	+ }
	52	+ }
	53	+ $(this).width(width).height( ChartHeight );
40	54	});
41	55	};
42	56
43	57	$('.visualizer-chart-canvas').adjust();
		@@ -42,10 +56,27 @@
42	56
43	57	$('.visualizer-chart-canvas').adjust();
44	58
45	59	$(document).ready(function () {
46		- $('.visualizer-chart, .visualizer-library-pagination').fadeIn(500);
	60	+ // clears the filters in the library form and submits.
	61	+ $('#viz-lib-reset').on('click', function(e){
	62	+ e.preventDefault();
	63	+ $(this).parent('form')[0].reset();
	64	+ $(this).parent('form').find('.viz-filter').each(function(index, el){
	65	+ var tag = $(el).prop('tagName').toLowerCase() + (typeof $(el).attr('type') !== 'undefined' ? $(el).attr('type').toLowerCase() : '');
	66	+ switch(tag){
	67	+ case 'select':
	68	+ $(el).prop('selectedIndex', 0);
	69	+ break;
	70	+ case 'inputtext':
	71	+ $(el).val('');
	72	+ break;
	73	+ }
47	74
	75	+ });
	76	+ $(this).parent('form').submit();
	77	+ });
	78	+
48	79	$('.visualizer-chart-shortcode').click(function (e) {
49	80	var range, selection;
50	81
51	82	if (window.getSelection && document.createRange) {
		@@ -60,14 +91,25 @@
60	91	range.select();
61	92	}
62	93	});
63	94
64		- $('.add-new-h2').click(function () {
	95	+ $('.add-new-chart').click(function () {
65	96	var wnd = window,
66	97	view = new vmv.Chart({action: vu.create});
67	98
	99	+ window.parent.addEventListener('message', function(event){
	100	+ switch(event.data) {
	101	+ case 'visualizer:mediaframe:close':
	102	+ view.close();
	103	+ break;
	104	+ }
	105	+ }, false);
	106	+
	107	+ // remove the 'type' while refreshing the library page on creation of a new chart.
	108	+ // this is to avoid cases where users have filtered for chart type A and end up creating chart type B
	109	+ // remove 'vaction' as well so that additional actions are removed
68	110	wnd.send_to_editor = function () {
69		- wnd.location.href = vu.base;
	111	+ wnd.location.href = vu.base.replace(/type=[a-zA-Z]*/, '').replace(/vaction/, '');
70	112	};
71	113	view.open();
72	114
73	115	return false;
		@@ -77,9 +119,9 @@
77	119	var wnd = window,
78	120	view = new vmv.Chart({action: vu.edit + '&chart=' + $(this).attr('data-chart')});
79	121
80	122	wnd.send_to_editor = function () {
81		- wnd.location.reload();
	123	+ wnd.location.href = wnd.location.href.replace(/vaction/, '');
82	124	};
83	125
84	126	view.open();
85	127
		@@ -105,8 +147,19 @@
105	147	}
106	148	});
107	149	return false;
108	150	});
	151	+
	152	+ $(".visualizer-chart-image").on("click", function () {
	153	+ $('body').trigger('visualizer:action:specificchart', {action: 'image', id: $(this).attr("data-chart"), data: null, dataObj: {name: $(this).attr("data-chart-title")}});
	154	+ return false;
	155	+ });
	156	+
	157	+ // if vaction=addnew is found as a GET request parameter, show the modal.
	158	+ if(location.href.indexOf('vaction=addnew') !== -1){
	159	+ $('.add-new-chart').first().trigger('click');
	160	+ }
	161	+
109	162	$(window).resize(function () {
110	163	clearTimeout(resizeTimeout);
111	164	resizeTimeout = setTimeout(function () {
112	165	$('.visualizer-chart-canvas').adjust();
		@@ -111,6 +164,11 @@
111	164	resizeTimeout = setTimeout(function () {
112	165	$('.visualizer-chart-canvas').adjust();
113	166	}, 100);
114	167	});
	168	+
	169	+ $('.visualizer-error i.error').on('click', function(){
	170	+ alert( $(this).attr('data-viz-error') );
	171	+ });
	172	+ $('.visualizer-chart:not(.visualizer-chart-display), .visualizer-library-pagination').fadeIn(500);
115	173	});
116	174	})(jQuery, visualizer.media.view, visualizer.urls);