Removed ls-wait, ls-count and di service

app/views/console/comps/header.phtml

@@ -3,7 +3,7 @@ use Utopia\Locale\Locale;
 ?>
 <header class="clear">
     &nbsp;&nbsp;&nbsp;
-    <div data-ls-wait="projects.load" class="list pull-start project-only">
+    <div class="list pull-start project-only">
         <select data-ls-loop="projects" data-ls-as="option" data-ls-bind="{{router.params.project}}" data-switch>
             <option data-ls-attrs="value={{option.$uid}}" data-ls-bind="{{option.name}}"></option>
         </select>

app/views/console/home/index.phtml

@@ -34,7 +34,7 @@
                             <div class="range">Current Month</div>
                         </div>
 
-                        <div class="chart" data-ls-wait="usage.load">
+                        <div class="chart">
                             <div class="content" data-ls-ui-chart></div>
                         </div>
                     </div>

app/views/console/settings/index.phtml

@@ -815,7 +815,7 @@ $scopes = [ // TODO sync with project list
                     </div>
                 </div>
             </li>
-            <li data-state="/console/settings/members?project={{router.params.project}}" data-ls-wait="project.load">
+            <li data-state="/console/settings/members?project={{router.params.project}}">
                 <h2><?php echo Locale::getText('console.settings.section.members.title'); ?></h2>
 
                 <div class="zone xl"

app/views/console/storage/index.phtml

@@ -14,7 +14,7 @@ $providers = $this->getParam('providers', []);
 
 <div class="zone xl">
 
-    <div data-ls-wait="project.load">
+    <div>
         <form class="row clear margin-bottom-tiny" data-forms-filter="filter-files" data-event="init">
             <div class="col span-4">
                 <div class="margin-bottom-small">

gulpfile.js

@@ -14,14 +14,11 @@ const configApp  = {
     src: [
         'public/scripts/dependencies/litespeed.js',
 
-        'public/scripts/sdk.js',
-
         'public/scripts/init.js',
 
         'public/scripts/services/alerts.js',
         'public/scripts/services/console.js',
         'public/scripts/services/date.js',
-        'public/scripts/services/di.js',
         'public/scripts/services/env.js',
         'public/scripts/services/markdown.js',
         'public/scripts/services/sdk.js',
@@ -30,10 +27,8 @@ const configApp  = {
         'public/scripts/routes.js',
         'public/scripts/filters.js',
         'public/scripts/app.js',
-        'public/scripts/appwrite.js',
 
-        'public/scripts/views/count.js',
-        'public/scripts/views/wait.js',
+        'public/scripts/views/service.js',
 
         'public/scripts/views/analytics/event.js',
         'public/scripts/views/analytics/pageview.js',
@@ -76,6 +71,7 @@ const configApp  = {
 const configDep = {
     mainFile: 'app-dep.js',
     src: [
+        'public/scripts/dependencies/appwrite.js',
         'public/scripts/dependencies/chart.js',
         'public/scripts/dependencies/markdown-it.js',
         'public/scripts/dependencies/pell.js',

public/scripts/services/di.js

@@ -1,30 +0,0 @@
-(function (window) {
-    "use strict";
-
-    window.ls.container.set('di', function () {
-        var list = {
-            'load': true
-        };
-
-        return {
-            listen: function (event, callback) {
-                if(list[event]) {
-                    callback();
-                }
-
-                document.addEventListener(event, callback);
-            },
-            report: function (event) {
-                list[event] = true;
-            },
-            check: function(event) {
-                return (list[event]);
-            },
-            reset: function () {
-                list = {'load': true};
-            },
-            list: list
-        };
-    }, true);
-
-})(window);

public/scripts/views/count.js

@@ -1,15 +0,0 @@
-(function (window) {
-    window.ls.container.get('view').add({
-        selector: 'data-ls-count',
-        template: false,
-        repeat: true,
-        controller: function(element) {
-            var count = parseInt(element.dataset['lsCount'] || 0);
-
-            element.dataset['lsCount'] = count + 1;
-
-            element.innerHTML = element.dataset['lsCount'];
-        }
-    });
-
-})(window);

public/scripts/views/forms/filter.js

@@ -104,8 +104,6 @@
                     bubbles: false,
                     cancelable: true
                 }));
-
-                di.report(name + '-changed');
             };
 
             switch (element.tagName) {
@@ -145,14 +143,6 @@
                             }, {once: true});
                         }
                         else {
-                            di.listen(events[y], function (e) {
-                                if(e) {
-                                    e.target.removeEventListener(e.type, arguments.callee);
-                                }
-
-                                apply(form.toJson(element));
-                            });
-
                             //document.addEventListener(events[y], function (e) {
                             //    e.target.removeEventListener(e.type, arguments.callee);
                             //    apply(form.toJson(element));

public/scripts/views/service.js

@@ -197,8 +197,6 @@
                                 }
                                 if (debug) console.log('%c[event triggered]: ' + triggers[i], 'color:green');
 
-                                di.report(triggers[i]);
-
                                 document.dispatchEvent(new CustomEvent(triggers[i]));
                             }
                         }
@@ -286,8 +284,6 @@
                                     continue;
                                 }
 
-                                di.report(triggers[i]);
-
                                 document.dispatchEvent(new CustomEvent(triggers[i]));
                             }
                         }
@@ -396,8 +392,6 @@
                             element.setAttribute('data-event', 'none'); // Avoid re-attaching event
                             break;
                         default:
-                            //document.addEventListener(events[y], exec);
-                            di.listen(events[y], exec);
                             element.setAttribute('data-event', 'none'); // Avoid re-attaching event
                     }
 

public/scripts/views/wait.js

@@ -1,36 +0,0 @@
-(function (window) {
-    window.ls.container.get('view').add({
-        selector: 'data-ls-wait',
-        template: false,
-        repeat: false,
-        controller: function(element, di, view) {
-            let debug   = (element.dataset['debug']);
-            let event   = element.dataset['lsWait'] || '';
-            let status  = di.check(event); // Has event already triggered
-
-            if (debug) { console.log(di.list); }
-
-            if(status) {
-                element.$lsSkip = false;
-                if (debug) { console.log('No Wait for ' + event); }
-                if (debug) { element.style.background = 'green'; }
-            }
-            else {
-                element.$lsSkip = true;
-
-                if (debug) { console.log('Wait for ' + event); }
-                if (debug) { element.style.background = 'yellow'; }
-
-                di.listen(event, function () {
-                    element.$lsSkip = false;
-
-                    if (debug) { console.log('Wait Over for ' + event); }
-                    if (debug) { element.style.background = 'blue'; }
-
-                    view.render(element);
-                });
-            }
-        }
-    });
-
-})(window);