jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Give monaco some time to settle the ui and add tooltips

Browse Source
This commit is contained in:
Johannes Zellner
2020-07-14 16:28:46 +02:00
parent 823cfca3c3
commit 3a54e662c2
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/filemanager.js
View File

@@ -6,7 +6,7 @@ require.config({ paths: { 'vs': '3rdparty/vs' }});
require(['vs/editor/editor.main'], function() {});
// create main application module
var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ngDrag']);
var app = angular.module('Application', ['angular-md5', 'ui-notification', 'ngDrag', 'ui.bootstrap']);
angular.module('Application').filter('prettyOwner', function () {
return function (uid) {
@@ -53,7 +53,7 @@ angular.forEach(
);
angular.module('ngDrag', []).directive(ngDragEventDirectives);
app.controller('FileManagerController', ['$scope', 'Client', function ($scope, Client) {
app.controller('FileManagerController', ['$scope', '$timeout', 'Client', function ($scope, $timeout, Client) {
var search = decodeURIComponent(window.location.search).slice(1).split('&').map(function (item) { return item.split('='); }).reduce(function (o, k) { o[k[0]] = k[1]; return o; }, {});
$scope.initialized = false;
@@ -370,11 +370,13 @@ app.controller('FileManagerController', ['$scope', 'Client', function ($scope, C
if (error) return Client.error(error);
if (!$scope.textEditor.editor) {
$scope.textEditor.editor = monaco.editor.create(document.getElementById('textEditorContainer'), {
value: result,
language: language,
theme: 'vs-dark'
});
$timeout(function () {
$scope.textEditor.editor = monaco.editor.create(document.getElementById('textEditorContainer'), {
value: result,
language: language,
theme: 'vs-dark'
});
}, 200);
} else {
$scope.textEditor.editor.setModel(monaco.editor.createModel(result, 'javascript'));
}