Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide

app/assets/javascripts/repo/repo_editor.js

@@ -105,7 +105,9 @@ export default class RepoEditor {
           this.monacoInstance.setModel(null);
 
           const languages = monaco.languages.getLanguages();
+          console.log(languages)
           const languageID = Helper.getLanguageIDForFile(this.activeFile, languages);
+          console.log('languageID',languageID)
           const newModel = monaco.editor.createModel(this.blobRaw, languageID);
 
           this.monacoInstance.setModel(newModel);

app/assets/javascripts/repo/repo_helper.js

@@ -23,16 +23,16 @@ const RepoHelper = {
   },
 
   findLanguage(ext, langs) {
-    langs.find(lang => lang.extensions && lang.extensions.indexOf(`.${ext}`) > -1);
+    return langs.find(lang => lang.extensions && lang.extensions.indexOf(`.${ext}`) > -1);
   },
 
   setDirectoryOpen(tree) {
-    if (!tree) return;
+    let file = tree;
+    if (!file) return;
 
-    /* eslint-disable no-param-reassign */
-    tree.opened = true;
-    tree.icon = 'fa-folder-open';
-    /* eslint-enable no-param-reassign */
+    file.opened = true;
+    file.icon = 'fa-folder-open';
+    return file;
   },
 
   getRawURLFromBlobURL(url) {
@@ -96,7 +96,7 @@ const RepoHelper = {
 
   getContent(treeOrFile) {
     let file = treeOrFile;
-    const loadingData = this.setLoading(true);
+    const loadingData = RepoHelper.setLoading(true);
 
     Service.getContent()
     .then((response) => {
@@ -133,8 +133,8 @@ const RepoHelper = {
         }
       } else {
         // it's a tree
-        RepoHelper.setDirectoryOpen(file);
-        const newDirectory = this.dataToListOfFiles(data);
+        file = RepoHelper.setDirectoryOpen(file);
+        const newDirectory = RepoHelper.dataToListOfFiles(data);
         Store.addFilesToDirectory(file, Store.files, newDirectory);
         Store.prevURL = Service.blobURLtoParentTree(Service.url);
       }
@@ -217,7 +217,7 @@ const RepoHelper = {
   },
 
   loadingError() {
-    new Flash('Unable to load the file at this time.'); // eslint-disable-line no-new
+    Flash('Unable to load the file at this time.');
   },
 };
 

app/assets/javascripts/repo/repo_store.js

@@ -98,19 +98,26 @@ const RepoStore = {
 
   removeChildFilesOfTree(tree) {
     let foundTree = false;
-    const newTree = tree;
-
+    const treeToClose = tree;
+    let wereDone = false;
     RepoStore.files = RepoStore.files.filter((file) => {
-      if (file.url === newTree.url) foundTree = true;
+      const isItTheTreeWeWant = file.url === treeToClose.url;
+      // if it's the next tree
+      if(foundTree && file.type === 'tree' && !isItTheTreeWeWant) {
+        wereDone = true;
+        return true;
+      }
+      if(wereDone) return true;
+
+      if (isItTheTreeWeWant) foundTree = true;
 
-      if (foundTree) return file.level <= newTree.level;
+      if (foundTree) return file.level <= treeToClose.level;
       return true;
     });
 
-    newTree.opened = false;
-    newTree.icon = 'fa-folder';
-
-    return newTree;
+    treeToClose.opened = false;
+    treeToClose.icon = 'fa-folder';
+    return treeToClose;
   },
 
   removeFromOpenedFiles(file) {

app/views/projects/tree/_tree_header.html.haml

@@ -3,7 +3,7 @@
     = render 'shared/ref_switcher', destination: 'tree', path: @path
 
 .tree-controls
-  %a.btn.btn-default.btn-grouped#editable-mode{ "href"=>"#", "@click.prevent" => "editClicked", "v-cloak" => 1 }
+  %a.btn.btn-default#editable-mode{ "href"=>"#", "@click.prevent" => "editClicked", "v-cloak" => 1 }
     %i{ ":class" => "buttonIcon" }
     %span {{buttonLabel}}