16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +35 -1
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3331dc20ec - Show all commits

16
app/www/static/css/index.css
View File

@ -412,4 +412,20 @@ body.mobile footer{
#reset{ #reset{
margin-top: 60px; margin-top: 60px;
}
#msg{
display: none;
width: 200px;
height: 44px;
border-radius: 6px;
position: fixed;
left: 50%;
margin-left: -100px;
margin-top: 45px;
background: rgba(100, 100, 100, 0.5);
color: #fff;
text-shadow: 1px 1px 0px #000;
}
#msg.active{
display: block;
} }

20
app/www/static/js/intval.core.js
View File

@ -275,15 +275,33 @@ UI.spinner.opts = {
UI.spinner.init = function () { UI.spinner.init = function () {
const spinner = new Spinner(UI.spinner.opts).spin(UI.spinner.elem); const spinner = new Spinner(UI.spinner.opts).spin(UI.spinner.elem);
}; };
UI.spinner.show = function () { UI.spinner.show = function (text) {
if (!UI.spinner.elem.classList.contains('active')) { if (!UI.spinner.elem.classList.contains('active')) {
UI.spinner.elem.classList.add('active'); UI.spinner.elem.classList.add('active');
} }
if (text) {
UI.message.show(text)
}
}; };
UI.spinner.hide = function () { UI.spinner.hide = function () {
if (UI.spinner.elem.classList.contains('active')) { if (UI.spinner.elem.classList.contains('active')) {
UI.spinner.elem.classList.remove('active'); UI.spinner.elem.classList.remove('active');
} }
};
UI.message = {
elem : document.getElementById('msg')
};
UI.message.show = function (text) {
UI.message.elem.innerHTML = text
if (!UI.message.elem.classList.contains('active')) {
UI.message.elem.classList.add('active');
}
};
UI.message.hide = function () {
if (UI.message.elem.classList.contains('active')) {
UI.message.elem.classList.remove('active');
}
}; };
var init = function () { var init = function () {