From f2781b2fb58189917c286e710232f06b80787720 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 8 Oct 2010 13:04:29 +0200 Subject: [PATCH] added loading animation fixed bug in uuid validation --- frontend/images/ladebild.gif | Bin 5059 -> 0 bytes frontend/images/loading.gif | Bin 0 -> 2608 bytes frontend/javascripts/frontend.js | 2 +- frontend/javascripts/uuid.js | 2 +- frontend/stylesheets/style.css | 10 +++++++--- 5 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 frontend/images/ladebild.gif create mode 100644 frontend/images/loading.gif diff --git a/frontend/images/ladebild.gif b/frontend/images/ladebild.gif deleted file mode 100644 index 2014bb8ec0d2e983cb748caf6ac64682589480d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5059 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 T)6_**#cgp_+?JL9(ew3BlNF>u literal 0 HcmV?d00001 diff --git a/frontend/javascripts/frontend.js b/frontend/javascripts/frontend.js index 4fd02b3..4c350bb 100644 --- a/frontend/javascripts/frontend.js +++ b/frontend/javascripts/frontend.js @@ -324,7 +324,7 @@ vz.entities.each = function(cb) { */ vz.plot.data.load = function() { vz.plot.data.clear(); - $('#plot').html('
loading...
'); // TODO insert loading animation + $('#plot').html('
loading...

Loading...

'); // TODO insert loading animation vz.entities.each(function(entity, parent) { if (entity.active && entity.type != 'group') { $.getJSON(vz.options.backendUrl + '/data/' + entity.uuid + '.json', { from: Math.floor(vz.from), to: Math.ceil(vz.to), tuples: vz.options.tuples }, waitAsync(function(json) { diff --git a/frontend/javascripts/uuid.js b/frontend/javascripts/uuid.js index 63fe718..c2b11eb 100644 --- a/frontend/javascripts/uuid.js +++ b/frontend/javascripts/uuid.js @@ -71,5 +71,5 @@ vz.uuids.remove = function(uuid) { * Validate UUID */ vz.uuids.validate = function(uuid) { - return new uuid.match(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/) > 0; + return uuid.match(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/); }; \ No newline at end of file diff --git a/frontend/stylesheets/style.css b/frontend/stylesheets/style.css index 0cfab98..8622a00 100644 --- a/frontend/stylesheets/style.css +++ b/frontend/stylesheets/style.css @@ -121,6 +121,10 @@ tbody tr td { text-align: right; } -.loading { - /* TODO center */ -} \ No newline at end of file +#loading { + display: block; + margin: auto; + padding-top: 150px; + text-align: center; + color: grey; +}