BigW Consortium Gitlab

Commit 54fa71d2 by Jacob Schatz

Fixes bugs that appeared when refactor of tree happened.

parent e38f6fcb
...@@ -105,7 +105,9 @@ export default class RepoEditor { ...@@ -105,7 +105,9 @@ export default class RepoEditor {
this.monacoInstance.setModel(null); this.monacoInstance.setModel(null);
const languages = monaco.languages.getLanguages(); const languages = monaco.languages.getLanguages();
console.log(languages)
const languageID = Helper.getLanguageIDForFile(this.activeFile, languages); const languageID = Helper.getLanguageIDForFile(this.activeFile, languages);
console.log('languageID',languageID)
const newModel = monaco.editor.createModel(this.blobRaw, languageID); const newModel = monaco.editor.createModel(this.blobRaw, languageID);
this.monacoInstance.setModel(newModel); this.monacoInstance.setModel(newModel);
......
...@@ -23,16 +23,16 @@ const RepoHelper = { ...@@ -23,16 +23,16 @@ const RepoHelper = {
}, },
findLanguage(ext, langs) { 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) { setDirectoryOpen(tree) {
if (!tree) return; let file = tree;
if (!file) return;
/* eslint-disable no-param-reassign */ file.opened = true;
tree.opened = true; file.icon = 'fa-folder-open';
tree.icon = 'fa-folder-open'; return file;
/* eslint-enable no-param-reassign */
}, },
getRawURLFromBlobURL(url) { getRawURLFromBlobURL(url) {
...@@ -132,7 +132,7 @@ const RepoHelper = { ...@@ -132,7 +132,7 @@ const RepoHelper = {
} }
} else { } else {
// it's a tree // it's a tree
this.setDirectoryOpen(file); file = this.setDirectoryOpen(file);
const newDirectory = this.dataToListOfFiles(data); const newDirectory = this.dataToListOfFiles(data);
Store.addFilesToDirectory(file, Store.files, newDirectory); Store.addFilesToDirectory(file, Store.files, newDirectory);
Store.prevURL = Service.blobURLtoParentTree(Service.url); Store.prevURL = Service.blobURLtoParentTree(Service.url);
...@@ -216,7 +216,7 @@ const RepoHelper = { ...@@ -216,7 +216,7 @@ const RepoHelper = {
}, },
loadingError() { 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 { ...@@ -44,7 +44,7 @@ export default class RepoSidebar {
let url = ''; let url = '';
if (typeof file === 'object') { if (typeof file === 'object') {
if (file.type === 'tree' && file.opened) { if (file.type === 'tree' && file.opened) {
Store.removeChildFilesOfTree(file); file = Store.removeChildFilesOfTree(file);
} }
url = file.url; url = file.url;
Service.url = url; Service.url = url;
......
...@@ -95,20 +95,20 @@ const RepoStore = { ...@@ -95,20 +95,20 @@ const RepoStore = {
this.activeFileLabel = 'Display source'; this.activeFileLabel = 'Display source';
}, },
/* eslint-disable no-param-reassign */
removeChildFilesOfTree(tree) { removeChildFilesOfTree(tree) {
let foundTree = false; let foundTree = false;
let treetoClose = tree;
this.files = this.files.filter((file) => { 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; return true;
}); });
tree.opened = false; treetoClose.opened = false;
tree.icon = 'fa-folder'; treetoClose.icon = 'fa-folder';
return treetoClose;
}, },
/* eslint-enable no-param-reassign */
removeFromOpenedFiles(file) { removeFromOpenedFiles(file) {
if (file.type === 'tree') return; if (file.type === 'tree') return;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= render 'shared/ref_switcher', destination: 'tree', path: @path = render 'shared/ref_switcher', destination: 'tree', path: @path
.tree-controls .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" } %i{ ":class" => "buttonIcon" }
%span {{buttonLabel}} %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