From 747f3519e07c0b1d494c117ea6854d2de6700f91 Mon Sep 17 00:00:00 2001
From: William Petit <wpetit@cadoles.com>
Date: Tue, 13 Oct 2015 14:32:22 +0200
Subject: [PATCH] =?UTF-8?q?Chargement=20s=C3=A9quentiel=20des=20applicatio?=
 =?UTF-8?q?ns/icones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/components/edit/edit-view.js    |  4 +---
 js/components/edit/profile-menu.js |  4 ++--
 js/components/edit/profile-tree.js |  1 +
 js/util/desktop-apps.js            | 35 ++++++++++++------------------
 js/util/promises.js                | 25 +++++++++++++++++++++
 5 files changed, 43 insertions(+), 26 deletions(-)
 create mode 100644 js/util/promises.js

diff --git a/js/components/edit/edit-view.js b/js/components/edit/edit-view.js
index eb29ffc..f7a89c7 100644
--- a/js/components/edit/edit-view.js
+++ b/js/components/edit/edit-view.js
@@ -21,11 +21,9 @@ var EditView = React.createClass({
 
     return (
       <div className="edit">
-        <div className="menu-bar">
-          <ProfileMenu />
-        </div>
         <div className="workspace">
           <div className="left-menu">
+            <ProfileMenu />
             <IconThemeSelector onThemeSelected={this.handleThemeSelect} />
             <DesktopAppList
               theme={this.props.theme}
diff --git a/js/components/edit/profile-menu.js b/js/components/edit/profile-menu.js
index e98e15a..00e3de7 100644
--- a/js/components/edit/profile-menu.js
+++ b/js/components/edit/profile-menu.js
@@ -10,8 +10,8 @@ var ProfileMenu = React.createClass({
 
       return (
         <div className="profile-menu">
-          <button className="btn btn-default" onClick={this.handleOpenClick}>Ouvrir</button>
-          <button className="btn btn-primary" onClick={this.handleSaveClick}>Enregistrer</button>
+          <button className="btn btn-default btn-sm" onClick={this.handleOpenClick}>Ouvrir</button>
+          <button className="btn btn-primary btn-sm" onClick={this.handleSaveClick}>Enregistrer</button>
         </div>
       );
 
diff --git a/js/components/edit/profile-tree.js b/js/components/edit/profile-tree.js
index 98f867e..b785acf 100644
--- a/js/components/edit/profile-tree.js
+++ b/js/components/edit/profile-tree.js
@@ -55,6 +55,7 @@ var ProfileTree = React.createClass({
 
     return (
       <div className="profile-tree">
+        <button className="btn btn-primary pull-right btn-sm" onClick={this.handleAddNewNode}>Ajouter un noeud</button>
         {this.renderTreeNode(this.props.profile)}
       </div>
     );
diff --git a/js/util/desktop-apps.js b/js/util/desktop-apps.js
index 1b0f0f6..fbb03fe 100644
--- a/js/util/desktop-apps.js
+++ b/js/util/desktop-apps.js
@@ -2,6 +2,7 @@ var path = require('path');
 var System = require('./system');
 var debug = require('./debug')('desktop-apps');
 var Cache = require('./cache');
+var promises = require('./promises');
 
 // Constants
 var ICON_REALPATH_REGEX = /\..+$/;
@@ -19,11 +20,9 @@ exports.loadAllDesktopFiles = function(rootDirs) {
   return exports.findAllDesktopFiles(rootDirs)
     .then(function(filePaths) {
 
-      var promises = filePaths.map(function(path) {
-        return exports.loadDesktopFile(path);
-      });
-
-      return Promise.all(promises)
+      return promises.seq(filePaths, function(path) {
+          return exports.loadDesktopFile(path);
+        })
         .then(function(contents) {
           return contents.map(function(content, i) {
             return { content: content, path: filePaths[i] };
@@ -47,12 +46,10 @@ exports.findAllDesktopFiles = function(baseDirs) {
   if(!Array.isArray(baseDirs)) {
     baseDirs = [baseDirs];
   }
-
-  var promises = baseDirs.map(function(baseDir) {
-    return System.findFiles('**/*.desktop', {cwd: baseDir, realpath: true});
-  });
-
-  return Promise.all(promises)
+  
+  return promises.seq(baseDirs, function(baseDir) {
+      return System.findFiles('**/*.desktop', {cwd: baseDir, realpath: true});
+    })
     .then(function(apps) {
       return uniq(flatten(apps));
     })
@@ -104,10 +101,9 @@ exports.findIcon = function(iconName, themeName, size, themeIgnore) {
     return exports.findIconThemes()
       .then(function(themes) {
         themeIgnore = themeIgnore || [];
-        var promises = themes.map(function(theme) {
-          return exports.findIcon(iconName, theme, size, themeIgnore);
-        });
-        return Promise.all(promises)
+        return promises.seq(themes, function(theme) {
+            return exports.findIcon(iconName, theme, size, themeIgnore);
+          })
           .then(exports._selectBestIcon)
         ;
       })
@@ -160,11 +156,9 @@ exports.findParentsThemeIcon = function(iconName, themeName, size, themeIgnore)
 
           debug('Found parents %j', parents);
 
-          var promises = parents.map(function(themeName) {
-            return exports.findIcon(iconName, themeName, size, themeIgnore);
-          });
-
-          return Promise.all(promises)
+          return promises.seq(parents, function(themeName) {
+              return exports.findIcon(iconName, themeName, size, themeIgnore);
+            })
             .then(exports._selectBestIcon)
           ;
 
@@ -278,7 +272,6 @@ exports._selectBestIcon = function(iconPaths) {
   return iconSelection.scalable || iconSelection.bitmap;
 };
 
-
 // Array helpers
 
 function clean(arr) {
diff --git a/js/util/promises.js b/js/util/promises.js
new file mode 100644
index 0000000..f7ddfda
--- /dev/null
+++ b/js/util/promises.js
@@ -0,0 +1,25 @@
+
+
+exports.seq = function(items, generator) {
+
+  var results = [];
+  var p = Promise.resolve();
+
+  for(var i = 0, len = items.length; i < len; ++i) {
+    p = p.then(generateNextHandler(items[i], i === 0));
+  }
+
+  return p.then(function(lastResult) {
+    results.push(lastResult);
+    return results;
+  });
+
+  // Internal helper
+  function generateNextHandler(item, ignoreResult) {
+    return function(prevResult) {
+      if(!ignoreResult) results.push(prevResult);
+      return generator(item, prevResult);
+    };
+  }
+
+};