← All changes | js/media/view.js +19 -30 3.0.6 → 1.6.5 View file →

		@@ -1,8 +1,4 @@
1		-/*jshint scripturl:true*/
2		-/* global google */
3		-/* global visualizer */
4		-/* global showNotice */
5	1	(function($, wpm) {
6	2	var libraryWidth, libraryHeight, wpmv, wpmV, wpmvv, wpmvvl, wpmvvb, l10n;
7	3
8	4	wpmv = wpm.view;
		@@ -58,20 +54,9 @@
58	54	settings.width = self.options.width;
59	55	settings.height = self.options.height;
60	56
61	57	table = new gv.DataTable({cols: series});
62		-
63		- switch (type) {
64		- case "gauge":
65		- case "table":
66		- case "timeline":
67		- chart = type.charAt(0).toUpperCase() + type.slice(1);
68		- break;
69		- default:
70		- chart = type.charAt(0).toUpperCase() + type.slice(1) + 'Chart';
71		- break;
72		- }
73		-
	58	+ chart = type == 'gauge' ? 'Gauge' : type.charAt(0).toUpperCase() + type.slice(1) + 'Chart';
74	59	chart = new gv[chart](self.el);
75	60
76	61	switch (type) {
77	62	case 'pie':
		@@ -76,9 +61,9 @@
76	61	switch (type) {
77	62	case 'pie':
78	63	if (settings.slices) {
79	64	for (i in settings.slices) {
80		- if (settings.slices[i]['color'] === '') {
	65	+ if (settings.slices[i]['color'] == '') {
81	66	delete settings.slices[i]['color'];
82	67	}
83	68	}
84	69	}
		@@ -90,9 +75,9 @@
90	75	case 'scatter':
91	76	case 'candlestick':
92	77	if (settings.series) {
93	78	for (i in settings.series) {
94		- if (settings.series[i]['color'] === '') {
	79	+ if (settings.series[i]['color'] == '') {
95	80	delete settings.series[i]['color'];
96	81	}
97	82	}
98	83	}
		@@ -97,9 +82,9 @@
97	82	}
98	83	}
99	84	break;
100	85	case 'geo':
101		- if (settings.region !== undefined && settings.region.replace(/^\s+|\s+$/g, '') === '') {
	86	+ if (settings.region != undefined && settings.region.replace(/^\s+|\s+$/g, '') == '') {
102	87	settings['region'] = 'world';
103	88	}
104	89	break;
105	90	case 'gauge':
		@@ -107,9 +92,9 @@
107	92	default:
108	93	return;
109	94	}
110	95
111		- if (series[0] && (series[0].type === 'date' || series[0].type === 'datetime')) {
	96	+ if (series[0] && (series[0].type == 'date' || series[0].type == 'datetime')) {
112	97	axis = false;
113	98	switch (type) {
114	99	case 'line':
115	100	case 'area':
		@@ -140,9 +125,9 @@
140	125
141	126	for (i = 0; i < data.length; i++) {
142	127	row = [];
143	128	for (j = 0; j < series.length; j++) {
144		- if (series[j].type === 'date' || series[j].type === 'datetime') {
	129	+ if (series[j].type == 'date' || series[j].type == 'datetime') {
145	130	date = new Date(data[i][j]);
146	131	data[i][j] = null;
147	132	if (Object.prototype.toString.call(date) === "[object Date]") {
148	133	if (!isNaN(date.getTime())) {
		@@ -157,9 +142,9 @@
157	142
158	143	if (settings.series) {
159	144	for (i = 0; i < settings.series.length; i++) {
160	145	format = settings.series[i].format;
161		- if (!format || format === '') {
	146	+ if (!format || format == '') {
162	147	continue;
163	148	}
164	149
165	150	formatter = null;
		@@ -368,9 +353,9 @@
368	353	createFilters: function() {
369	354	var self = this;
370	355
371	356	self.filters = {};
372		- _.each(l10n.library.types, function(type, i) {
	357	+ _.each(['all', 'pie', 'line', 'area', 'bar', 'column', 'geo', 'scatter', 'gauge', 'candlestick'], function(type, i) {
373	358	self.filters[type] = {
374	359	text: l10n.library.filters[type],
375	360	key: type,
376	361	priority: (i + 1) * 10
		@@ -411,11 +396,15 @@
411	396
412	397	self.$el.html(_.chain(items).map(function(item) {
413	398	var content, className;
414	399
415		- content = item === '...' || item === self.options.page ? self.make('span', { class: 'visualizer-library-pagination-page' }, item) : self.make('a', { class: 'visualizer-library-pagination-page', href: 'javascript:;', 'data-page': item }, item);
	400	+ content = item == '...' || item == self.options.page
	401	+ ? self.make('span', { class: 'visualizer-library-pagination-page' }, item)
	402	+ : self.make('a', { class: 'visualizer-library-pagination-page', href: 'javascript:;', 'data-page': item }, item);
416	403
417		- className = item === self.options.page ? 'visualizer-library-pagination-item visualizer-library-pagination-active' : 'visualizer-library-pagination-item';
	404	+ className = item == self.options.page
	405	+ ? 'visualizer-library-pagination-item visualizer-library-pagination-active'
	406	+ : 'visualizer-library-pagination-item';
418	407
419	408	return self.make('li', { class: className }, content);
420	409	}).value());
421	410	},
		@@ -429,9 +418,9 @@
429	418	}
430	419	} else {
431	420	tmp = current - Math.floor( max / 2 );
432	421
433		- if ( max % 2 === 0 ) {
	422	+ if ( max % 2 == 0 ) {
434	423	tmp++;
435	424	}
436	425
437	426	if ( tmp < 1 ) {
		@@ -445,14 +434,14 @@
445	434	for ( i = 1; i <= max; i++ ) {
446	435	pagenation.push(tmp++);
447	436	}
448	437
449		- if ( pagenation[0] !== 1 ) {
	438	+ if ( pagenation[0] != 1 ) {
450	439	pagenation[0] = 1;
451	440	pagenation[1] = '...';
452	441	}
453	442
454		- if ( pagenation[max - 1] !== total ) {
	443	+ if ( pagenation[max - 1] != total ) {
455	444	pagenation[max - 1] = total;
456	445	pagenation[max - 2] = '...';
457	446	}
458	447	}
		@@ -497,9 +486,9 @@
497	486	$this.append(locker);
498	487	});
499	488
500	489	return $(this);
501		- };
	490	+ }
502	491
503	492	$.fn.unlock = function() {
504	493	$(this).each(function() {
505	494	var $this = $(this);
		@@ -510,6 +499,6 @@
510	499	}).find('.locker').remove();
511	500	});
512	501
513	502	return $(this);
514		- };
	503	+ }
515	504	})(jQuery);