Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Y
yjs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sweng-group-15
yjs
Commits
bc856a09
Commit
bc856a09
authored
8 years ago
by
Kevin Jahns
Browse files
Options
Downloads
Patches
Plain Diff
Release 11.2.1
parent
f7ae62a9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dist
+1
-1
1 addition, 1 deletion
dist
package.json
+1
-1
1 addition, 1 deletion
package.json
src/y.js
+19
-16
19 additions, 16 deletions
src/y.js
with
21 additions
and
18 deletions
dist
@
428d825f
Compare
b9f9c762
...
428d825f
Subproject commit
b9f9c762ebed9b30c44b1c87b555e89a7257ae58
Subproject commit
428d825f4141fd3198bb88aee88a014278c4c856
This diff is collapsed.
Click to expand it.
package.json
+
1
−
1
View file @
bc856a09
{
{
"name"
:
"yjs"
,
"name"
:
"yjs"
,
"version"
:
"11.2.
0
"
,
"version"
:
"11.2.
1
"
,
"description"
:
"A framework for real-time p2p shared editing on arbitrary complex data types"
,
"description"
:
"A framework for real-time p2p shared editing on arbitrary complex data types"
,
"main"
:
"./src/y.js"
,
"main"
:
"./src/y.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
This diff is collapsed.
Click to expand it.
src/y.js
+
19
−
16
View file @
bc856a09
...
@@ -50,6 +50,7 @@ function requestModules (modules) {
...
@@ -50,6 +50,7 @@ function requestModules (modules) {
})
})
promises
.
push
(
requireModule
.
promise
)
promises
.
push
(
requireModule
.
promise
)
}
else
{
}
else
{
console
.
info
(
'
YJS: Please do not depend on automatic requiring of modules anymore! Extend modules as follows `require(
\'
y-modulename
\'
)(Y)`
'
)
require
(
modulename
)(
Y
)
require
(
modulename
)(
Y
)
}
}
}
else
{
}
else
{
...
@@ -96,23 +97,25 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
...
@@ -96,23 +97,25 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
modules
.
push
(
opts
.
share
[
name
])
modules
.
push
(
opts
.
share
[
name
])
}
}
Y
.
sourceDir
=
opts
.
sourceDir
Y
.
sourceDir
=
opts
.
sourceDir
return
Y
.
requestModules
(
modules
).
then
(
function
()
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
return
new
Promise
(
function
(
resolve
,
reject
)
{
setTimeout
(
function
()
{
if
(
opts
==
null
)
reject
(
'
An options object is expected!
'
)
Y
.
requestModules
(
modules
).
then
(
function
()
{
else
if
(
opts
.
connector
==
null
)
reject
(
'
You must specify a connector! (missing connector property)
'
)
if
(
opts
==
null
)
reject
(
'
An options object is expected!
'
)
else
if
(
opts
.
connector
.
name
==
null
)
reject
(
'
You must specify connector name! (missing connector.name property)
'
)
else
if
(
opts
.
connector
==
null
)
reject
(
'
You must specify a connector! (missing connector property)
'
)
else
if
(
opts
.
db
==
null
)
reject
(
'
You must specify a database! (missing db property)
'
)
else
if
(
opts
.
connector
.
name
==
null
)
reject
(
'
You must specify connector name! (missing connector.name property)
'
)
else
if
(
opts
.
connector
.
name
==
null
)
reject
(
'
You must specify db name! (missing db.name property)
'
)
else
if
(
opts
.
db
==
null
)
reject
(
'
You must specify a database! (missing db property)
'
)
else
if
(
opts
.
share
==
null
)
reject
(
'
You must specify a set of shared types!
'
)
else
if
(
opts
.
connector
.
name
==
null
)
reject
(
'
You must specify db name! (missing db.name property)
'
)
else
{
else
if
(
opts
.
share
==
null
)
reject
(
'
You must specify a set of shared types!
'
)
var
yconfig
=
new
YConfig
(
opts
)
else
{
yconfig
.
db
.
whenUserIdSet
(
function
()
{
var
yconfig
=
new
YConfig
(
opts
)
yconfig
.
init
(
function
()
{
yconfig
.
db
.
whenUserIdSet
(
function
()
{
resolve
(
yconfig
)
yconfig
.
init
(
function
()
{
resolve
(
yconfig
)
})
})
})
}
)
}
}
}
).
catch
(
reject
)
})
}
,
0
)
})
})
}
}
...
...
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