From 3ef1e03e4273544cce177ce7fa0e0ab75eded990 Mon Sep 17 00:00:00 2001
From: Alvin Li <liweitianux@gmail.com>
Date: Wed, 21 Aug 2013 07:55:06 +0800
Subject: med 'indicator/static/javascripts/load_card.js' to 'card_chart.js *
set Highcharts global options in 'card_chart.js' *
'indicator/templates/indicator/SheetDefault.html': added js function
'chart_getdata_draw()' to draw chart for card * improved
'indicator.views.ajax_get_card_data_chart()' * implemented drawing chart for
'FLOAT_TYPE' and 'RANGE_TYPE' indicators * added datetime plugin 'momentjs':
'indicator/static/plugins/moment/', version 2.1.0 *
'indicator/templates/indicator/NewDeleteIndex.html': added link button to
goto 'indicator_status' SheetDefault.html page * added option 'useHTML: true'
for Highcharts; improved the display style of ylabels, if value >9999, then
show in exponential notation * improved drawing of 'detail_chart', and the
'detail_card_info' * moved js global var to 'SheetDefault.html'; renamed
var 'card_detail_id' to 'detail_card_id' * fixed js local variables problem;
added 'var' keyword * added check of 'date' for
'indicator.models.IndicatorRecord' * ThickBox: removed param 'no1_title' from
thickbox popup page's url placed the param 'card_id' before 'TB_iframe' *
changed to use 'ANNOTATION_TYPES' for 'sciblog.models.BlogAnnotation' *
improved 'indicator/templates/indicator/popup/IndexDesc.html' improved
'indicator.views.indicator_indexdesc()' * added 'sympy' to
'env/requirements.pip'
TODO:
* BlogAnnotation: 'get_absolute_url()' -> 'IndexDesc: go_library_btn'
* detail_card_info: data table
* Data input/edit form, and validate & submit
* Highcharts xAxis labels problem ??
---
97suifangqa/staticfiles/javascripts/jargon-display.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
(limited to '97suifangqa/staticfiles/javascripts')
diff --git a/97suifangqa/staticfiles/javascripts/jargon-display.js b/97suifangqa/staticfiles/javascripts/jargon-display.js
index c1af712..9ddfe91 100644
--- a/97suifangqa/staticfiles/javascripts/jargon-display.js
+++ b/97suifangqa/staticfiles/javascripts/jargon-display.js
@@ -31,8 +31,12 @@ function jargon_display(annotations) {
jargonDisplayBox.data('jargon', jargon);
$(".name", $(this)).text(jargon.name);
$(".jargon-details", $(this)).html(jargon.content);
- if (jargon.type == 0){$("a.collect", $(this)).hide()}
- else {$("a.collect", $(this)).text(text).show()}
+ if (jargon.type == 0) {
+ $("a.collect", $(this)).hide();
+ }
+ else {
+ $("a.collect", $(this)).text(text).show();
+ }
/* Maxwell modified */
})
@@ -130,3 +134,4 @@ function jargon_display(annotations) {
})
}
+// vim: set ts=4 sw=4 tw=0 fenc=utf-8 ft=javascript:
--
cgit v1.2.2