diff --git a/.travis.yml b/.travis.yml index 75a39aa..7bd2f83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,4 +94,3 @@ script: - if [ ${MOODLE_PLUGIN_CI} = "2" ]; then moodle-plugin-ci mustache; fi - if [ ${MOODLE_PLUGIN_CI} = "2" ]; then moodle-plugin-ci grunt; fi - if [ ${MOODLE_PLUGIN_CI} = "2" ]; then moodle-plugin-ci behat --dump; fi - diff --git a/tests/behat/installed.feature b/tests/behat/installed.feature index 88711b6..8db1b08 100644 --- a/tests/behat/installed.feature +++ b/tests/behat/installed.feature @@ -9,4 +9,4 @@ Feature: Installation succeeds And I navigate to "Plugins overview" node in "Site administration > Plugins" Then the following should exist in the "plugins-control-panel" table: |RecordRTC| - |tinymce_recordrtc| \ No newline at end of file + |tinymce_recordrtc| diff --git a/tinymce/js/compatcheckmodule.js b/tinymce/js/compatcheckmodule.js index 1d08947..50d30ab 100644 --- a/tinymce/js/compatcheckmodule.js +++ b/tinymce/js/compatcheckmodule.js @@ -33,12 +33,14 @@ M.tinymce_recordrtc.check_secure = function() { var isSecureOrigin = (window.location.protocol === 'https:') || (window.location.host.indexOf('localhost') !== -1); - if (!isSecureOrigin && (window.bowser.chrome || window.bowser.opera)) { - M.tinymce_recordrtc.show_alert('gumsecurity', function() { - tinyMCEPopup.close(); - }); - } else if (!isSecureOrigin) { + if (!isSecureOrigin){ alertDanger.ancestor().ancestor().removeClass('hide'); + + if(window.bowser.chrome || window.bowser.opera){ + M.tinymce_recordrtc.show_alert('gumsecurity', function() { + tinyMCEPopup.close(); + }); + } } };