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
a587e2c4
Commit
a587e2c4
authored
Aug 25, 2017
by
yann300
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move createNonclashingName to Helper
parent
3387cac9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
app.js
src/app.js
+2
-11
file-panel.js
src/app/panels/file-panel.js
+2
-1
helper.js
src/lib/helper.js
+8
-0
No files found.
src/app.js
View file @
a587e2c4
...
@@ -12,6 +12,7 @@ var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
...
@@ -12,6 +12,7 @@ var OffsetToLineColumnConverter = require('./lib/offsetToLineColumnConverter')
var
QueryParams
=
require
(
'./lib/query-params'
)
var
QueryParams
=
require
(
'./lib/query-params'
)
var
GistHandler
=
require
(
'./lib/gist-handler'
)
var
GistHandler
=
require
(
'./lib/gist-handler'
)
var
helpers
=
require
(
'./lib/helpers'
)
var
Storage
=
require
(
'./storage'
)
var
Storage
=
require
(
'./storage'
)
var
Browserfiles
=
require
(
'./app/files/browser-files'
)
var
Browserfiles
=
require
(
'./app/files/browser-files'
)
var
chromeCloudStorageSync
=
require
(
'./app/files/chromeCloudStorageSync'
)
var
chromeCloudStorageSync
=
require
(
'./app/files/chromeCloudStorageSync'
)
...
@@ -215,19 +216,10 @@ function run () {
...
@@ -215,19 +216,10 @@ function run () {
filesProviders
:
filesProviders
filesProviders
:
filesProviders
})
})
function
createNonClashingName
(
path
)
{
var
counter
=
''
if
(
path
.
endsWith
(
'.sol'
))
path
=
path
.
substring
(
0
,
path
.
lastIndexOf
(
'.sol'
))
while
(
filesProviders
[
'browser'
].
exists
(
path
+
counter
+
'.sol'
))
{
counter
=
(
counter
|
0
)
+
1
}
return
path
+
counter
+
'.sol'
}
// Add files received from remote instance (i.e. another browser-solidity)
// Add files received from remote instance (i.e. another browser-solidity)
function
loadFiles
(
filesSet
)
{
function
loadFiles
(
filesSet
)
{
for
(
var
f
in
filesSet
)
{
for
(
var
f
in
filesSet
)
{
filesProviders
[
'browser'
].
set
(
createNonClashingName
(
f
),
filesSet
[
f
].
content
)
filesProviders
[
'browser'
].
set
(
helpers
.
createNonClashingName
(
f
,
filesProviders
[
'browser'
]
),
filesSet
[
f
].
content
)
}
}
fileManager
.
switchFile
()
fileManager
.
switchFile
()
}
}
...
@@ -273,7 +265,6 @@ function run () {
...
@@ -273,7 +265,6 @@ function run () {
// ---------------- FilePanel --------------------
// ---------------- FilePanel --------------------
var
FilePanelAPI
=
{
var
FilePanelAPI
=
{
createName
:
createNonClashingName
,
switchFile
:
function
(
path
)
{
switchFile
:
function
(
path
)
{
fileManager
.
switchFile
(
path
)
fileManager
.
switchFile
(
path
)
},
},
...
...
src/app/panels/file-panel.js
View file @
a587e2c4
...
@@ -10,6 +10,7 @@ var modalDialog = require('../ui/modaldialog')
...
@@ -10,6 +10,7 @@ var modalDialog = require('../ui/modaldialog')
var
modalDialogCustom
=
require
(
'../ui/modal-dialog-custom'
)
var
modalDialogCustom
=
require
(
'../ui/modal-dialog-custom'
)
var
QueryParams
=
require
(
'../../lib/query-params'
)
var
QueryParams
=
require
(
'../../lib/query-params'
)
var
queryParams
=
new
QueryParams
()
var
queryParams
=
new
QueryParams
()
var
helpers
=
require
(
'../../lib/helpers'
)
var
styleGuide
=
require
(
'../../style-guide'
)
var
styleGuide
=
require
(
'../../style-guide'
)
var
styles
=
styleGuide
()
var
styles
=
styleGuide
()
...
@@ -244,7 +245,7 @@ function filepanel (appAPI, filesProvider) {
...
@@ -244,7 +245,7 @@ function filepanel (appAPI, filesProvider) {
}
}
function
createNewFile
()
{
function
createNewFile
()
{
var
newName
=
filesProvider
[
'browser'
].
type
+
'/'
+
appAPI
.
createName
(
'Untitled.sol'
)
var
newName
=
filesProvider
[
'browser'
].
type
+
'/'
+
helpers
.
createNonClashingName
(
'Untitled.sol'
,
filesProvider
[
'browser'
]
)
if
(
!
filesProvider
[
'browser'
].
set
(
newName
,
''
))
{
if
(
!
filesProvider
[
'browser'
].
set
(
newName
,
''
))
{
modalDialogCustom
.
alert
(
'Failed to create file '
+
newName
)
modalDialogCustom
.
alert
(
'Failed to create file '
+
newName
)
}
else
{
}
else
{
...
...
src/lib/helper.js
View file @
a587e2c4
...
@@ -7,5 +7,13 @@ module.exports = {
...
@@ -7,5 +7,13 @@ module.exports = {
if
(
data
.
length
<
5
)
return
data
if
(
data
.
length
<
5
)
return
data
var
len
=
data
.
length
var
len
=
data
.
length
return
data
.
slice
(
0
,
5
)
+
'...'
+
data
.
slice
(
len
-
5
,
len
)
return
data
.
slice
(
0
,
5
)
+
'...'
+
data
.
slice
(
len
-
5
,
len
)
},
createNonClashingName
(
path
,
fileProvider
)
{
var
counter
=
''
if
(
path
.
endsWith
(
'.sol'
))
path
=
path
.
substring
(
0
,
path
.
lastIndexOf
(
'.sol'
))
while
(
fileProvider
.
exists
(
path
+
counter
+
'.sol'
))
{
counter
=
(
counter
|
0
)
+
1
}
return
path
+
counter
+
'.sol'
}
}
}
}
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