Commit 54fa71d2 authored by Jacob Schatz's avatar Jacob Schatz

Fixes bugs that appeared when refactor of tree happened.

parent e38f6fcb
......@@ -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);
......
......@@ -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) {
......@@ -132,7 +132,7 @@ const RepoHelper = {
}
} else {
// it's a tree
this.setDirectoryOpen(file);
file = this.setDirectoryOpen(file);
const newDirectory = this.dataToListOfFiles(data);
Store.addFilesToDirectory(file, Store.files, newDirectory);
Store.prevURL = Service.blobURLtoParentTree(Service.url);
......@@ -216,7 +216,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.');
},
};
......
......@@ -44,7 +44,7 @@ export default class RepoSidebar {
let url = '';
if (typeof file === 'object') {
if (file.type === 'tree' && file.opened) {
Store.removeChildFilesOfTree(file);
file = Store.removeChildFilesOfTree(file);
}
url = file.url;
Service.url = url;
......
......@@ -95,20 +95,20 @@ const RepoStore = {
this.activeFileLabel = 'Display source';
},
/* eslint-disable no-param-reassign */
removeChildFilesOfTree(tree) {
let foundTree = false;
let treetoClose = tree;
this.files = this.files.filter((file) => {
if (file.url === tree.url) foundTree = true;
if (file.url === treetoClose.url) foundTree = true;
if (foundTree) return file.level <= tree.level;
if (foundTree) return file.level <= treetoClose.level;
return true;
});
tree.opened = false;
tree.icon = 'fa-folder';
treetoClose.opened = false;
treetoClose.icon = 'fa-folder';
return treetoClose;
},
/* eslint-enable no-param-reassign */
removeFromOpenedFiles(file) {
if (file.type === 'tree') return;
......
......@@ -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}}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment