Skip to content

Commit 81fa431

Browse files
committed
Merge branch 'develop'
2 parents be15198 + f015e69 commit 81fa431

File tree

5 files changed

+1155
-2043
lines changed

5 files changed

+1155
-2043
lines changed

Dashboard.module

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -225,22 +225,22 @@ class Dashboard extends Process implements Module
225225
}
226226
}
227227

228+
// Ignore ajax requests that are not requesting a panel render
229+
if ($this->config->ajax && !$this->input->post->dashboard) {
230+
return;
231+
}
232+
228233
// Load settings from hook
229234
$this->settings = $this->getSettings();
230235

231236
// Load panel instances from hook
232237
$this->panels = $this->getPanels();
233238

234-
if ($this->config->ajax) {
235-
if ($this->input->post->dashboard) {
236-
// Ajax request? (Re)render a single requested panel
237-
$key = $this->input->post->key;
238-
$panel = $this->input->post->panel;
239-
return $this->renderInstanceByKey($key, $panel);
240-
} else {
241-
// Disregard all other ajax requests
242-
return;
243-
}
239+
// Check if we have any panels to render via ajax
240+
if ($this->config->ajax && $this->input->post->dashboard) {
241+
$key = $this->input->post->key;
242+
$panel = $this->input->post->panel;
243+
return $this->renderInstanceByKey($key, $panel);
244244
}
245245

246246
// Set browser title

DashboardPanelChart.module

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class DashboardPanelChart extends DashboardPanel
4747

4848
public function getScripts()
4949
{
50-
return ['https://cdn.jsdelivr.net/npm/chart.js@2.9.4'];
50+
return ['https://cdn.jsdelivr.net/npm/chart.js@2'];
5151
}
5252

5353
/**

composer.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,9 @@
8383
auto2top: true,
8484
}
8585
</script>
86-
<script src="//unpkg.com/docsify/lib/docsify.min.js"></script>
86+
<script src="//unpkg.com/docsify@4/lib/docsify.min.js"></script>
8787
<script src="https://cdn.jsdelivr.net/npm/docsify-themeable@0"></script>
88-
<script src="//unpkg.com/prismjs/components/prism-php.min.js"></script>
89-
<script src="//unpkg.com/docsify-copy-code"></script>
88+
<script src="//unpkg.com/prismjs@1/components/prism-php.min.js"></script>
89+
<script src="//unpkg.com/docsify-copy-code@3"></script>
9090
</body>
9191
</html>

0 commit comments

Comments
 (0)