Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
8b0bd58b
Commit
8b0bd58b
authored
Oct 05, 2015
by
chriseth
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #26 from d11e9/gh-pages
improved error and warning navigation
parents
d4d76091
31e60341
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
11 deletions
+16
-11
index.html
index.html
+15
-10
browser-solidity.css
stylesheets/browser-solidity.css
+1
-1
No files found.
index.html
View file @
8b0bd58b
...
...
@@ -104,6 +104,7 @@ THE SOFTWARE.
SOL_CACHE_FILE
=
getFiles
()[
0
];
editor
.
setValue
(
window
.
localStorage
[
SOL_CACHE_FILE
],
-
1
);
editor
.
resize
(
true
);
session
.
setMode
(
"ace/mode/javascript"
);
session
.
setTabSize
(
4
);
session
.
setUseSoftTabs
(
true
);
...
...
@@ -278,7 +279,7 @@ THE SOFTWARE.
$
(
'#ghostbar'
).
remove
();
$
(
document
).
unbind
(
'mousemove'
);
dragging
=
false
;
setEditorSize
(
delta
)
setEditorSize
(
delta
)
;
window
.
localStorage
.
setItem
(
EDITOR_SIZE_CACHE_KEY
,
delta
);
}
});
...
...
@@ -346,7 +347,7 @@ THE SOFTWARE.
var
onChange
=
function
()
{
var
input
=
editor
.
getValue
();
if
(
input
===
""
)
{
window
.
localStorage
.
setItem
(
SOL_CACHE_FILE
,
''
)
window
.
localStorage
.
setItem
(
SOL_CACHE_FILE
,
''
)
;
return
;
}
if
(
input
===
previousInput
)
...
...
@@ -364,18 +365,18 @@ THE SOFTWARE.
};
function
includeLocalImports
(
input
)
{
var
importRegex
=
/import
\s[\'\"]([^\'\"]
+
)[\'\"]
;/g
var
importRegex
=
/import
\s[\'\"]([^\'\"]
+
)[\'\"]
;/g
;
var
imports
=
[];
var
matches
=
[];
var
match
;
while
((
match
=
importRegex
.
exec
(
input
))
!==
null
)
{
if
(
match
[
1
]
&&
getFiles
().
indexOf
(
fileKey
(
match
[
1
]))
!==
-
1
)
{
imports
.
push
(
match
[
1
])
matches
.
push
(
match
[
0
])
imports
.
push
(
match
[
1
])
;
matches
.
push
(
match
[
0
])
;
}
}
for
(
var
i
in
imports
)
{
imported
=
includeLocalImports
(
window
.
localStorage
.
getItem
(
fileKey
(
imports
[
i
])
))
imported
=
includeLocalImports
(
window
.
localStorage
.
getItem
(
fileKey
(
imports
[
i
])
))
;
input
=
input
.
replace
(
matches
[
i
],
imported
);
}
return
input
;
...
...
@@ -393,19 +394,23 @@ THE SOFTWARE.
var
renderError
=
function
(
message
)
{
var
type
=
message
.
match
(
/^
[
0-9:
]
* Warning: /
)
?
'warning'
:
'error'
;
$
(
'#output'
)
.
append
(
$
(
'<pre class="'
+
type
+
'"></pre>'
).
text
(
message
)
);
var
err
=
message
.
match
(
/^:
([
0-9
]
*
)
:
([
0-9
]
*
)
/
)
var
$error
=
$
(
'<pre class="'
+
type
+
'"></pre>'
).
text
(
message
);
$
(
'#output'
).
append
(
$error
);
var
err
=
message
.
match
(
/^:
([
0-9
]
*
)
:
([
0-9
]
*
)
/
)
;
if
(
err
&&
err
.
length
)
{
var
errLine
=
parseInt
(
err
[
1
],
10
)
-
1
;
var
errCol
=
err
[
2
]
?
parseInt
(
err
[
2
],
10
)
:
0
;
sourceAnnotations
[
sourceAnnotations
.
length
]
=
{
sourceAnnotations
[
sourceAnnotations
.
length
]
=
{
row
:
errLine
,
column
:
errCol
,
text
:
message
,
type
:
type
};
editor
.
getSession
().
setAnnotations
(
sourceAnnotations
);
$error
.
click
(
function
(
ev
){
editor
.
focus
();
editor
.
gotoLine
(
errLine
+
1
,
errCol
-
1
,
true
);
});
}
};
...
...
stylesheets/browser-solidity.css
View file @
8b0bd58b
...
...
@@ -224,7 +224,7 @@ body {
background-color
:
rgba
(
210
,
202
,
36
,
0.5
);
border-radius
:
0
;
word-wrap
:
break-word
;
border
:
1px
solid
#
D00909
;
border
:
1px
solid
#
BBB427
;
}
#ghostbar
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment