merged

apache · Apr 7, 2015 · 871a9a1975ce5d5652a0cbd5d4e8100f52566eb8 · 871a9a1
2 parents faffcd8 + 1d0f381
commit 871a9a1975ce5d5652a0cbd5d4e8100f52566eb8
Showing 19 changed files with 227 additions and 1,524 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .vagrant/
-.idea/
+.idea/
+node_modules/
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/dashboard/files/test_app/index.html b/dashboard/files/test_app/index.html
@@ -127,6 +127,7 @@ <h3 id="map" class="section-header">Map<a class="anchorjs-link" href="#map"><spa
 
     </div>
     <div class="col-md-7">
+        <input id="clear-button" class="btn btn-default" type="button" value="Clear">
         <div class="output">
             <table>
                 <thead>

diff --git a/dashboard/files/test_app/js/logging.js b/dashboard/files/test_app/js/logging.js
@@ -70,15 +70,19 @@ $(document).ready(function () {
 
         ale2.log(msg);
 
-        setTimeout(function () {
-            elem.fadeOut(400, function () {
-                $(this).remove();
-            });
-        }, 2000)
+        //setTimeout(function () {
+        //    elem.fadeOut(400, function () {
+        //        $(this).remove();
+        //    });
+        //}, 2000)
 
 
     }
 
+    $('#clear-button').click(function() {
+        $('.output tbody tr').remove();
+    });
+
     window.myLog = log;
 
 

diff --git a/dashboard/files/test_app/js/userale.js b/dashboard/files/test_app/js/userale.js
diff --git a/dashboard/files/test_app/js/userale.js.map b/dashboard/files/test_app/js/userale.js.map
diff --git a/helper-libs/javascript/.gitignore b/helper-libs/javascript/.gitignore
diff --git a/helper-libs/javascript/activities.coffee b/helper-libs/javascript/activities.coffee
diff --git a/helper-libs/javascript/activities.js b/helper-libs/javascript/activities.js
diff --git a/helper-libs/javascript/activities.js.map b/helper-libs/javascript/activities.js.map