← All changes | js/media/view.js +18 -76 3.0.5 → 1.2.0 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;
		@@ -38,9 +34,9 @@
38	34	wpmV.apply(this, arguments);
39	35	},
40	36
41	37	render: function() {
42		- var self, model, chart, gv, type, series, data, table, settings, i, j, row, date, format, formatter, axis, property;
	38	+ var self, model, chart, gv, type, series, data, table, settings, i, j, row, date;
43	39
44	40	self = this;
45	41	gv = google.visualization;
46	42	model = self.model;
		@@ -54,13 +50,10 @@
54	50	series = model.get('series');
55	51	data = model.get('data');
56	52	settings = model.get('settings');
57	53
58		- settings.width = self.options.width;
59		- settings.height = self.options.height;
60		-
61	54	table = new gv.DataTable({cols: series});
62		- chart = type === 'gauge' ? 'Gauge' : type.charAt(0).toUpperCase() + type.slice(1) + 'Chart';
	55	+ chart = type == 'gauge' ? 'Gauge' : type.charAt(0).toUpperCase() + type.slice(1) + 'Chart';
63	56	chart = new gv[chart](self.el);
64	57
65	58	switch (type) {
66	59	case 'pie':
		@@ -65,9 +58,9 @@
65	58	switch (type) {
66	59	case 'pie':
67	60	if (settings.slices) {
68	61	for (i in settings.slices) {
69		- if (settings.slices[i]['color'] === '') {
	62	+ if (settings.slices[i]['color'] == '') {
70	63	delete settings.slices[i]['color'];
71	64	}
72	65	}
73	66	}
		@@ -79,9 +72,9 @@
79	72	case 'scatter':
80	73	case 'candlestick':
81	74	if (settings.series) {
82	75	for (i in settings.series) {
83		- if (settings.series[i]['color'] === '') {
	76	+ if (settings.series[i]['color'] == '') {
84	77	delete settings.series[i]['color'];
85	78	}
86	79	}
87	80	}
		@@ -86,9 +79,9 @@
86	79	}
87	80	}
88	81	break;
89	82	case 'geo':
90		- if (settings.region !== undefined && settings.region.replace(/^\s+|\s+$/g, '') === '') {
	83	+ if (settings.region != undefined && settings.region.replace(/^\s+|\s+$/g, '') == '') {
91	84	settings['region'] = 'world';
92	85	}
93	86	break;
94	87	case 'gauge':
		@@ -96,42 +89,12 @@
96	89	default:
97	90	return;
98	91	}
99	92
100		- if (series[0] && (series[0].type === 'date' || series[0].type === 'datetime')) {
101		- axis = false;
102		- switch (type) {
103		- case 'line':
104		- case 'area':
105		- case 'scatter':
106		- case 'candlestick':
107		- case 'column':
108		- axis = settings.hAxis;
109		- break;
110		- case 'bar':
111		- axis = settings.vAxis;
112		- break;
113		- }
114		-
115		- if (axis) {
116		- for (property in axis.viewWindow) {
117		- date = new Date(axis.viewWindow[property]);
118		- if (Object.prototype.toString.call(date) === "[object Date]") {
119		- if (!isNaN(date.getTime())) {
120		- axis.viewWindow[property] = date;
121		- continue;
122		- }
123		- }
124		-
125		- delete axis.viewWindow[property];
126		- }
127		- }
128		- }
129		-
130	93	for (i = 0; i < data.length; i++) {
131	94	row = [];
132	95	for (j = 0; j < series.length; j++) {
133		- if (series[j].type === 'date' || series[j].type === 'datetime') {
	96	+ if (series[j].type == 'date' || series[j].type == 'datetime') {
134	97	date = new Date(data[i][j]);
135	98	data[i][j] = null;
136	99	if (Object.prototype.toString.call(date) === "[object Date]") {
137	100	if (!isNaN(date.getTime())) {
		@@ -143,33 +106,8 @@
143	106	}
144	107	table.addRow(row);
145	108	}
146	109
147		- if (settings.series) {
148		- for (i = 0; i < settings.series.length; i++) {
149		- format = settings.series[i].format;
150		- if (!format || format === '') {
151		- continue;
152		- }
153		-
154		- formatter = null;
155		- switch (series[i + 1].type) {
156		- case 'number':
157		- formatter = new gv.NumberFormat({pattern: format});
158		- break;
159		- case 'date':
160		- case 'datetime':
161		- case 'timeofday':
162		- formatter = new gv.DateFormat({pattern: format});
163		- break;
164		- }
165		-
166		- if (formatter) {
167		- formatter.format(table, i + 1);
168		- }
169		- }
170		- }
171		-
172	110	chart.draw(table, settings);
173	111	}
174	112	});
175	113
		@@ -357,9 +295,9 @@
357	295	createFilters: function() {
358	296	var self = this;
359	297
360	298	self.filters = {};
361		- _.each(l10n.library.types, function(type, i) {
	299	+ _.each(['all', 'pie', 'line', 'area', 'bar', 'column', 'geo', 'scatter', 'gauge', 'candlestick'], function(type, i) {
362	300	self.filters[type] = {
363	301	text: l10n.library.filters[type],
364	302	key: type,
365	303	priority: (i + 1) * 10
		@@ -400,11 +338,15 @@
400	338
401	339	self.$el.html(_.chain(items).map(function(item) {
402	340	var content, className;
403	341
404		- 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);
	342	+ content = item == '...' || item == self.options.page
	343	+ ? self.make('span', { class: 'visualizer-library-pagination-page' }, item)
	344	+ : self.make('a', { class: 'visualizer-library-pagination-page', href: 'javascript:;', 'data-page': item }, item);
405	345
406		- className = item === self.options.page ? 'visualizer-library-pagination-item visualizer-library-pagination-active' : 'visualizer-library-pagination-item';
	346	+ className = item == self.options.page
	347	+ ? 'visualizer-library-pagination-item visualizer-library-pagination-active'
	348	+ : 'visualizer-library-pagination-item';
407	349
408	350	return self.make('li', { class: className }, content);
409	351	}).value());
410	352	},
		@@ -418,9 +360,9 @@
418	360	}
419	361	} else {
420	362	tmp = current - Math.floor( max / 2 );
421	363
422		- if ( max % 2 === 0 ) {
	364	+ if ( max % 2 == 0 ) {
423	365	tmp++;
424	366	}
425	367
426	368	if ( tmp < 1 ) {
		@@ -434,14 +376,14 @@
434	376	for ( i = 1; i <= max; i++ ) {
435	377	pagenation.push(tmp++);
436	378	}
437	379
438		- if ( pagenation[0] !== 1 ) {
	380	+ if ( pagenation[0] != 1 ) {
439	381	pagenation[0] = 1;
440	382	pagenation[1] = '...';
441	383	}
442	384
443		- if ( pagenation[max - 1] !== total ) {
	385	+ if ( pagenation[max - 1] != total ) {
444	386	pagenation[max - 1] = total;
445	387	pagenation[max - 2] = '...';
446	388	}
447	389	}
		@@ -486,9 +428,9 @@
486	428	$this.append(locker);
487	429	});
488	430
489	431	return $(this);
490		- };
	432	+ }
491	433
492	434	$.fn.unlock = function() {
493	435	$(this).each(function() {
494	436	var $this = $(this);
		@@ -499,6 +441,6 @@
499	441	}).find('.locker').remove();
500	442	});
501	443
502	444	return $(this);
503		- };
	445	+ }
504	446	})(jQuery);