kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from mabasic/fading

Browse Source 
Added animation to options alert and removed chrome styles
This commit is contained in:
Mario Bašić
2015-05-27 23:36:41 +02:00
parent 7ab435434b 92b33ac18c
commit edd179f2d1
4 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
assets/js/options.js
View File

@@ -2,6 +2,8 @@
global.jQuery = require('jquery');
require('bootstrap');
var $ = require('jquery');
// Saves options to chrome.storage.sync.
function save_options(e) {
e.preventDefault();
@@ -14,16 +16,17 @@ function save_options(e) {
blacklist: blacklist
}, function() {
// Update status to let user know options were saved.
var status = document.getElementById('status');
status.style.display = 'block';
status.innerHTML = '<strong>Well done!</strong> Options have been saved.';
var status = $('#status');
status.html('<strong>Well done!</strong> Options have been saved.');
//TODO: This is a nice place for fade in and fade out...
status.fadeIn(1500, function() {
setTimeout(function() {
status.fadeOut(1500, function() {
status.html('');
});
}, 750);
});
setTimeout(function() {
status.textContent = '';
status.style.display = 'none';
}, 1500);
});
}

4
gulpfile.js
View File

@@ -19,7 +19,7 @@ elixir(function (mix) {
mix.copy('vendor/bower_components/font-awesome/less', 'assets/less/font-awesome');
mix.copy('vendor/bower_components/font-awesome/fonts', 'public/fonts');
mix.less('app.less');
mix.browserify('app.js', null, 'assets/js');
//mix.browserify('app.js', null, 'assets/js');
//mix.browserify('events.js', 'public/js/events.js', 'assets/js');
//mix.browserify('options.js', 'public/js/options.js', 'assets/js');
mix.browserify('options.js', 'public/js/options.js', 'assets/js');
});

2
manifest.json
View File

@@ -29,6 +29,6 @@
},
"options_ui": {
"page": "options.html",
"chrome_style": true
"chrome_style": false
}
}

20
public/js/options.js
View File

@@ -6,6 +6,8 @@
global.jQuery = require('jquery');
require('bootstrap');
var $ = require('jquery');
// Saves options to chrome.storage.sync.
function save_options(e) {
e.preventDefault();
@@ -18,16 +20,16 @@ function save_options(e) {
blacklist: blacklist
}, function () {
// Update status to let user know options were saved.
var status = document.getElementById('status');
status.style.display = 'block';
status.innerHTML = '<strong>Well done!</strong> Options have been saved.';
var status = $('#status');
status.html('<strong>Well done!</strong> Options have been saved.');
//TODO: This is a nice place for fade in and fade out...
setTimeout(function () {
status.textContent = '';
status.style.display = 'none';
}, 1500);
status.fadeIn(1500, function () {
setTimeout(function () {
status.fadeOut(1500, function () {
status.html('');
});
}, 750);
});
});
}