← All changes | js/library.js +56 -5 3.1.3 → 3.6.1 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,8 +41,9 @@
35	41	var width = $('#visualizer-library').width(),
36	42	margin = width * 0.02;
37	43
38	44	width *= 0.305;
	45	+ $(this).prev( '.visualizer-chart-title' ).width(width - 14);
39	46	$(this).width(width - 14).height(width * 0.75).parent().css('margin-right', margin + 'px').css('margin-bottom', margin + 'px');
40	47	});
41	48	};
42	49
		@@ -42,10 +49,27 @@
42	49
43	50	$('.visualizer-chart-canvas').adjust();
44	51
45	52	$(document).ready(function () {
46		- $('.visualizer-chart, .visualizer-library-pagination').fadeIn(500);
	53	+ // clears the filters in the library form and submits.
	54	+ $('#viz-lib-reset').on('click', function(e){
	55	+ e.preventDefault();
	56	+ $(this).parent('form')[0].reset();
	57	+ $(this).parent('form').find('.viz-filter').each(function(index, el){
	58	+ var tag = $(el).prop('tagName').toLowerCase() + (typeof $(el).attr('type') !== 'undefined' ? $(el).attr('type').toLowerCase() : '');
	59	+ switch(tag){
	60	+ case 'select':
	61	+ $(el).prop('selectedIndex', 0);
	62	+ break;
	63	+ case 'inputtext':
	64	+ $(el).val('');
	65	+ break;
	66	+ }
47	67
	68	+ });
	69	+ $(this).parent('form').submit();
	70	+ });
	71	+
48	72	$('.visualizer-chart-shortcode').click(function (e) {
49	73	var range, selection;
50	74
51	75	if (window.getSelection && document.createRange) {
		@@ -60,14 +84,25 @@
60	84	range.select();
61	85	}
62	86	});
63	87
64		- $('.add-new-h2').click(function () {
	88	+ $('.add-new-chart').click(function () {
65	89	var wnd = window,
66	90	view = new vmv.Chart({action: vu.create});
67	91
	92	+ window.parent.addEventListener('message', function(event){
	93	+ switch(event.data) {
	94	+ case 'visualizer:mediaframe:close':
	95	+ view.close();
	96	+ break;
	97	+ }
	98	+ }, false);
	99	+
	100	+ // remove the 'type' while refreshing the library page on creation of a new chart.
	101	+ // this is to avoid cases where users have filtered for chart type A and end up creating chart type B
	102	+ // remove 'vaction' as well so that additional actions are removed
68	103	wnd.send_to_editor = function () {
69		- wnd.location.href = vu.base;
	104	+ wnd.location.href = vu.base.replace(/type=[a-zA-Z]*/, '').replace(/vaction/, '');
70	105	};
71	106	view.open();
72	107
73	108	return false;
		@@ -77,9 +112,9 @@
77	112	var wnd = window,
78	113	view = new vmv.Chart({action: vu.edit + '&chart=' + $(this).attr('data-chart')});
79	114
80	115	wnd.send_to_editor = function () {
81		- wnd.location.reload();
	116	+ wnd.location.href = wnd.location.href.replace(/vaction/, '');
82	117	};
83	118
84	119	view.open();
85	120
		@@ -105,8 +140,19 @@
105	140	}
106	141	});
107	142	return false;
108	143	});
	144	+
	145	+ $(".visualizer-chart-image").on("click", function () {
	146	+ $('body').trigger('visualizer:action:specificchart', {action: 'image', id: $(this).attr("data-chart"), data: null, dataObj: {name: $(this).attr("data-chart-title")}});
	147	+ return false;
	148	+ });
	149	+
	150	+ // if vaction=addnew is found as a GET request parameter, show the modal.
	151	+ if(location.href.indexOf('vaction=addnew') !== -1){
	152	+ $('.add-new-chart').first().trigger('click');
	153	+ }
	154	+
109	155	$(window).resize(function () {
110	156	clearTimeout(resizeTimeout);
111	157	resizeTimeout = setTimeout(function () {
112	158	$('.visualizer-chart-canvas').adjust();
		@@ -111,6 +157,11 @@
111	157	resizeTimeout = setTimeout(function () {
112	158	$('.visualizer-chart-canvas').adjust();
113	159	}, 100);
114	160	});
	161	+
	162	+ $('.visualizer-error i.error').on('click', function(){
	163	+ alert( $(this).attr('data-viz-error') );
	164	+ });
	165	+ $('.visualizer-chart:not(.visualizer-chart-display), .visualizer-library-pagination').fadeIn(500);
115	166	});
116	167	})(jQuery, visualizer.media.view, visualizer.urls);