Skip to content

Commit 8a1727a

Browse files
committed
fixes
1 parent c9496b7 commit 8a1727a

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

frontend/express/public/javascripts/countly/countly.helpers.js

+2-7
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,8 @@
309309
*/
310310
CountlyHelpers.isJSON = function(val) {
311311
try {
312-
val = JSON.parse(val);
313-
if (val) {
314-
return true;
315-
}
316-
else {
317-
return true;
318-
}
312+
JSON.parse(val);
313+
return true;
319314
}
320315
catch (notJSONError) {
321316
return false;

frontend/express/public/javascripts/countly/countly.template.js

+14-13
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ var countlyView = Backbone.View.extend({
240240
/**
241241
* View class to expand by plugins which need configuration under Management->Applications.
242242
*/
243-
var countlyManagementView = countlyView.extend({ // eslint-disable-line
243+
window.countlyManagementView = countlyView.extend({
244244
/**
245245
* Handy function which returns currently saved configuration of this plugin or empty object.
246246
*
@@ -840,17 +840,16 @@ var AppRouter = Backbone.Router.extend({
840840
return true;
841841
}
842842

843-
if (el.is(":visible")) {
844-
//do nothing
845-
}
846-
else if ($(".sidebar-submenu").is(":visible")) {
847-
$(".sidebar-submenu").hide();
848-
el.css({ "right": "-110px" }).show().animate({ "right": "0" }, { duration: 300, easing: 'easeOutExpo' });
849-
addText();
850-
}
851-
else {
852-
el.css({ "right": "-170px" }).show().animate({ "right": "0" }, { duration: 300, easing: 'easeOutExpo' });
853-
addText();
843+
if (!el.is(":visible")) {
844+
if ($(".sidebar-submenu").is(":visible")) {
845+
$(".sidebar-submenu").hide();
846+
el.css({ "right": "-110px" }).show().animate({ "right": "0" }, { duration: 300, easing: 'easeOutExpo' });
847+
addText();
848+
}
849+
else {
850+
el.css({ "right": "-170px" }).show().animate({ "right": "0" }, { duration: 300, easing: 'easeOutExpo' });
851+
addText();
852+
}
854853
}
855854
/** function add text to menu title */
856855
function addText() {
@@ -1162,6 +1161,8 @@ var AppRouter = Backbone.Router.extend({
11621161
return (v1 == v2) ? options.fn(this) : options.inverse(this); // eslint-disable-line
11631162
case '!=':
11641163
return (v1 != v2) ? options.fn(this) : options.inverse(this); // eslint-disable-line
1164+
case '!==':
1165+
return (v1 !== v2) ? options.fn(this) : options.inverse(this);
11651166
case '===':
11661167
return (v1 === v2) ? options.fn(this) : options.inverse(this);
11671168
case '<':
@@ -2386,7 +2387,7 @@ var AppRouter = Backbone.Router.extend({
23862387
$(this).next(".dataTables_filter").find("input").focus();
23872388
});
23882389

2389-
var exportDrop = "";
2390+
var exportDrop;
23902391
if (oSettings.oFeatures.bServerSide) {
23912392
tableWrapper.find(".dataTables_length").show();
23922393
tableWrapper.find('#dataTables_length_input').bind('change.DT', function(/*e, _oSettings*/) {

0 commit comments

Comments
 (0)