Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 2 additions and 8 deletions
Showing only changes of commit 42aa573698 - Show all commits

View File

@ -258,6 +258,7 @@
delayScale : 'ms', delayScale : 'ms',
counter : 0 counter : 0
} }
//functions
var frame; var frame;
var getState; var getState;
var setDir; var setDir;
@ -386,15 +387,10 @@
$('#mscriptIcon').removeClass('selected'); $('#mscriptIcon').removeClass('selected');
$('#settingsIcon').addClass('selected'); $('#settingsIcon').addClass('selected');
}; };
function () {
};
</script> </script>
<script> <script>
var web = {}; var web = {};
web.frame = function () { web.frame = function () {
'use strict';
$.ajax({ $.ajax({
method : 'POST', method : 'POST',
url : '/frame', url : '/frame',
@ -404,7 +400,6 @@
}); });
} }
web.frameSuccess = function (res) { web.frameSuccess = function (res) {
'use strict';
$('#frame').blur(); $('#frame').blur();
if (res.dir === true) { if (res.dir === true) {
incCounter(1); incCounter(1);
@ -413,8 +408,7 @@
} }
}; };
web.setDir = function () { web.setDir = function () {
'use strict'; var dir = document.getElementById('dir').checked;
var dir = !$('#dir').is(':checked');
/*$.ajax({ /*$.ajax({
method : 'POST', method : 'POST',
url : '/dir', url : '/dir',