1. Fixed the javascript & style bug that appeared in different versions of IE for temporal graph vis. (see NIHVIVO-2035)
This commit is contained in:
parent
ff52e4d798
commit
da4cc41fa4
7 changed files with 4456 additions and 3 deletions
|
@ -0,0 +1,5 @@
|
|||
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
|
||||
|
||||
#yaxislabel {
|
||||
margin-left: -27px;
|
||||
}
|
1427
productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
vendored
Normal file
1427
productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
1
productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js
vendored
Normal file
1
productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load diff
462
productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js
vendored
Normal file
462
productMods/js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
|
@ -1030,7 +1030,7 @@ function prepareTableForDataTablePagination(jsonData){
|
|||
"oLanguage": {
|
||||
"sInfo": "Records _START_ - _END_ of _TOTAL_",
|
||||
"sInfoEmpty": "No matching entities found",
|
||||
"sInfoFiltered": "",
|
||||
"sInfoFiltered": ""
|
||||
},
|
||||
"sPaginationType": "gmail_style",
|
||||
"fnDrawCallback": function () {
|
||||
|
|
|
@ -37,8 +37,16 @@
|
|||
|
||||
<#-- Javascript files -->
|
||||
|
||||
<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'>
|
||||
<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'>
|
||||
<#-- Currently we are using the developer build version for both flot & excanvas libraries,
|
||||
this is because IE 9 complains about certain properties. After testing it seems that dev
|
||||
build version is stable enough. If in next couple of days we feel that there are some issues
|
||||
we will default to using the stable version unless the request comes from IE 9 in which case
|
||||
we will use rev 293 (dev build version) of the flot & excanvas files.
|
||||
-->
|
||||
<#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/r293/excanvas.min.js'>
|
||||
<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/r293/jquery.flot.min.js'>
|
||||
|
||||
|
||||
<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'>
|
||||
<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'>
|
||||
<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'>
|
||||
|
@ -64,6 +72,7 @@ ${scripts.add(jqueryNotify)}
|
|||
<#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" />
|
||||
<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" />
|
||||
<#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" />
|
||||
<#assign entityComparisonStyleIE_6_7_Hack = "${urls.base}/css/visualization/entitycomparison/layout-ie-67.css" />
|
||||
<#assign vizStyle = "css/visualization/visualization.css" />
|
||||
|
||||
${stylesheets.add(jqueryUIStyle)}
|
||||
|
@ -72,6 +81,7 @@ ${stylesheets.add(entityComparisonStyle)}
|
|||
${stylesheets.add(vizStyle)}
|
||||
${stylesheets.add(jqueryNotifyStyle)}
|
||||
<!--[if IE]><link href="${entityComparisonStyleIEHack}" rel="stylesheet" type="text/css" /><![endif]-->
|
||||
<!--[if lt IE 8]><link href="${entityComparisonStyleIE_6_7_Hack}" rel="stylesheet" type="text/css" /><![endif]-->
|
||||
|
||||
<#-- variables passed from server-side code -->
|
||||
<script language="JavaScript" type="text/javascript">
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue