Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
texjs-web
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Mehren
texjs-web
Commits
005bf446
Commit
005bf446
authored
Mar 12, 2015
by
James Allen
Browse files
Options
Downloads
Patches
Plain Diff
Show initializing message
parent
438f359c
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/views/project/editor/output_panel/script_output.jade
+6
-0
6 additions, 0 deletions
app/views/project/editor/output_panel/script_output.jade
public/coffee/ide/script-output/controllers/ScriptOutputController.coffee
+16
-4
16 additions, 4 deletions
...e/script-output/controllers/ScriptOutputController.coffee
with
22 additions
and
4 deletions
app/views/project/editor/output_panel/script_output.jade
+
6
−
0
View file @
005bf446
...
...
@@ -24,6 +24,12 @@ div.full-size(ng-controller="ScriptOutputController")
i.fa.fa-level-up.fa-flip-horizontal.fa-2x
| Click here to run your script!
.alert.alert-info(ng-show="running && stillIniting && !inited")
p
i.fa.fa-spinner.fa-spin.fa-fw
| Initializing environment...
p.small (This can take a while the first time you run a script)
span.output(ng-repeat="part in output | orderBy:'msg_id' track by $index ")
span(ng-if="part.output_type == 'stdout'").stdout {{ part.text }}
span(ng-if="part.output_type == 'stderr'").stderr {{ part.text }}
...
...
This diff is collapsed.
Click to expand it.
public/coffee/ide/script-output/controllers/ScriptOutputController.coffee
+
16
−
4
View file @
005bf446
...
...
@@ -10,6 +10,8 @@ define [
$scope
.
error
=
false
$scope
.
timedout
=
false
$scope
.
session_id
=
Math
.
random
().
toString
().
slice
(
2
)
$scope
.
stillIniting
=
false
$scope
.
inited
=
false
reset
()
$scope
.
uncompiled
=
true
...
...
@@ -21,6 +23,10 @@ define [
# We get messages from other user's compiles in this project. Ignore them
return
if
message
.
header
?
.
session
!=
$scope
.
session_id
if
message
.
msg_type
==
"system_status"
and
message
.
content
.
status
==
"starting_run"
$scope
.
inited
=
true
$scope
.
$apply
()
else
output
=
parseOutputMessage
(
message
)
if
output
?
$scope
.
output
.
push
output
...
...
@@ -31,6 +37,10 @@ define [
return
if
$scope
.
needToUpgrade
reset
()
initing
=
setTimeout
()
->
$scope
.
stillIniting
=
true
$scope
.
$apply
()
,
1000
$scope
.
running
=
true
$scope
.
uncompiled
=
false
...
...
@@ -42,11 +52,13 @@ define [
doCompile
(
rootDoc_id
,
compiler
)
.
success
(
data
)
->
clearTimeout
(
initing
)
$scope
.
running
=
false
if
data
?
.
status
==
"timedout"
$scope
.
timedout
=
true
.
error
()
->
clearTimeout
(
initing
)
$scope
.
running
=
false
$scope
.
error
=
true
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment