Skip to content

Commit 4705c9a

Browse files
committed
Disable chart JS to prevent issue when JS files are merged #41 issue
1 parent e0a1d45 commit 4705c9a

File tree

2 files changed

+11
-1
lines changed
  • app

2 files changed

+11
-1
lines changed

app/code/community/Hackathon/MageMonitoring/Helper/Data.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,4 +620,14 @@ public function getConst($typestring)
620620
{
621621
return constant('self::'.$typestring);
622622
}
623+
624+
/**
625+
* To prevent issue if merge files feature is enabled.
626+
*
627+
* @return bool
628+
*/
629+
public function chartjsDisabled()
630+
{
631+
return !Mage::getStoreConfigFlag('dev/js/merge_files');
632+
}
623633
}

app/design/adminhtml/default/default/layout/monitoring.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<action method="addItem"><type>skin_js</type><script>monitoring/js/jquery.js</script></action>
4747
<action method="addItem"><type>skin_js</type><script>monitoring/js/jquery.noconflict.js</script></action>
4848
<action method="addItem"><type>skin_js</type><script>monitoring/js/globalize.min.js</script></action>
49-
<action method="addItem"><type>skin_js</type><script>monitoring/js/dx.chartjs.js</script></action>
5049
<action method="addItem"><type>skin_js</type><script>monitoring/js/jquery.jsontotable.js</script></action>
5150
<action method="addItem"><type>skin_js</type><script>monitoring/js/healthcheck.js</script></action>
51+
<action method="addItem" ifconfig="magemonitoring/chartjsDisabled"><type>skin_js</type><script>monitoring/js/dx.chartjs.js</script></action>
5252
<action method="addItem"><type>skin_css</type><script>monitoring/css/healthcheck.css</script></action>
5353
</reference>
5454
</monitoring_css_js>

0 commit comments

Comments
 (0)