merge latest staging and resolve conflicts

2017-11-24 13:46:59 +01:00
parent 56102d3689 9795ac32cb
commit a3c093838c
30 changed files with 446 additions and 403 deletions
--- a/www/common/sframe-common-codemirror.js
+++ b/www/common/sframe-common-codemirror.js
@@ -213,6 +213,7 @@ define([
                left: true, // Open to the left of the button
                isSelect: true,
                feedback: 'CODE_LANGUAGE',
+                common: Common
            };
            var $block = exp.$language = UIElements.createDropdown(dropdownConfig);
            $block.find('button').attr('title', Messages.languageButtonTitle);
@@ -250,6 +251,7 @@ define([
                    isSelect: true,
                    initialValue: lastTheme,
                    feedback: 'CODE_THEME',
+                    common: Common
                };
                var $block = exp.$theme = UIElements.createDropdown(dropdownConfig);
                $block.find('button').attr('title', Messages.themeButtonTitle);