Merge branch 'staging' into framework

2017-10-13 13:41:24 +03:00
parent a6b34491fc 7b6432f134
commit 15337603bb
12 changed files with 54 additions and 54 deletions
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -190,6 +190,7 @@ define([
        });
    };
    funcs.setPadAttribute = function (key, value, cb) {
+        cb = cb || $.noop;
        ctx.sframeChan.query('Q_SET_PAD_ATTRIBUTE', {
            key: key,
            value: value