yonote/yjs
19
0
Fork 0
Code Pull Requests 1 Releases Activity

update port

Browse Source
This commit is contained in:
Kevin Jahns 2015-12-02 20:04:11 +01:00
parent 5da36f07ce
commit 08f0702fcd
8 changed files with 43 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/Jigsaw/index.html
View File

@ -17,7 +17,7 @@
</g>
</svg>
<script src="../bower_components/yjs/y.es6"></script>
<script src="../bower_components/yjs/y.js"></script>
<script src="../bower_components/d3/d3.js"></script>
<script src="./index.js"></script>
</body>

2
Examples/Jigsaw/index.js
View File

@ -7,9 +7,9 @@ Y({
name: 'memory'
},
connector: {
url: 'http://127.0.0.1:1234',
name: 'websockets-client',
room: 'Puzzle-example2',
url: 'http://127.0.0.1:2345',
debug: true
},
sourceDir: '/bower_components',

2
Examples/Textarea/index.html
View File

@ -3,7 +3,7 @@
<body>
<textarea style="width:80%;" rows=40 id="textfield"></textarea>
<script src="../bower_components/yjs/y.es6"></script>
<script src="../bower_components/yjs/y.js"></script>
<script src="./index.js"></script>
</body>
</html>

4
Examples/Textarea/index.js
View File

@ -7,7 +7,9 @@ Y({
},
connector: {
name: 'websockets-client',
room: 'Textarea-example'
room: 'Textarea-example',
url: 'http://127.0.0.1:2345',
debug: true
},
sourceDir: '/bower_components',
share: {

34
y.es6
View File

@ -1814,7 +1814,7 @@ module.exports = function (Y/* :any */) {
}
* addOperation (op) {
yield* this.os.put(op)
if (!this.store.y.connector.isDisconnected() && this.store.forwardAppliedOperations) {
if (!this.store.y.connector.isDisconnected() && this.store.forwardAppliedOperations && op.id[0] !== '_') {
// is connected, and this is not going to be send in addOperation
this.store.y.connector.broadcast({
type: 'update',
@ -2223,30 +2223,26 @@ function requestModules (modules) {
// determine if this module was compiled for es5 or es6 (y.js vs. y.es6)
// if Insert.execute is a Function, then it isnt a generator..
// then load the es5(.js) files..
var extention = Y.Struct.Insert.execute.constructor === Function ? '.js' : '.es6'
var extention = typeof regeneratorRuntime !== 'undefined' ? '.js' : '.es6'
var promises = []
for (var i = 0; i < modules.length; i++) {
var modulename = 'y-' + modules[i].toLowerCase()
if (Y[modules[i]] == null) {
if (requiringModules[modules[i]] == null) {
try {
require(modulename)(Y)
} catch (e) {
// module does not exist
if (typeof window !== 'undefined') {
var imported = document.createElement('script')
imported.src = Y.sourceDir + '/' + modulename + '/' + modulename + extention
document.head.appendChild(imported)
// module does not exist
if (typeof window !== 'undefined' && window.Y !== 'undefined') {
var imported = document.createElement('script')
imported.src = Y.sourceDir + '/' + modulename + '/' + modulename + extention
document.head.appendChild(imported)
let requireModule = {}
requiringModules[modules[i]] = requireModule
requireModule.promise = new Promise(function (resolve) {
requireModule.resolve = resolve
})
promises.push(requireModule.promise)
} else {
throw e
}
let requireModule = {}
requiringModules[modules[i]] = requireModule
requireModule.promise = new Promise(function (resolve) {
requireModule.resolve = resolve
})
promises.push(requireModule.promise)
} else {
require(modulename)(Y)
}
} else {
promises.push(requiringModules[modules[i]].promise)

2
y.es6.map
View File

File diff suppressed because one or more lines are too long

44
y.js
View File

@ -4044,7 +4044,7 @@ module.exports = function (Y /* :any */) {
return _context18.delegateYield(this.os.put(op), 't0', 1);
case 1:
if (!this.store.y.connector.isDisconnected() && this.store.forwardAppliedOperations) {
if (!this.store.y.connector.isDisconnected() && this.store.forwardAppliedOperations && op.id[0] !== '_') {
// is connected, and this is not going to be send in addOperation
this.store.y.connector.broadcast({
type: 'update',
@ -4801,35 +4801,31 @@ function requestModules(modules) {
// determine if this module was compiled for es5 or es6 (y.js vs. y.es6)
// if Insert.execute is a Function, then it isnt a generator..
// then load the es5(.js) files..
var extention = Y.Struct.Insert.execute.constructor === Function ? '.js' : '.es6';
var extention = typeof regeneratorRuntime !== 'undefined' ? '.js' : '.es6';
var promises = [];
for (var i = 0; i < modules.length; i++) {
var modulename = 'y-' + modules[i].toLowerCase();
if (Y[modules[i]] == null) {
if (requiringModules[modules[i]] == null) {
try {
// module does not exist
if (typeof window !== 'undefined' && window.Y !== 'undefined') {
var imported;
(function () {
imported = document.createElement('script');
imported.src = Y.sourceDir + '/' + modulename + '/' + modulename + extention;
document.head.appendChild(imported);
var requireModule = {};
requiringModules[modules[i]] = requireModule;
requireModule.promise = new Promise(function (resolve) {
requireModule.resolve = resolve;
});
promises.push(requireModule.promise);
})();
} else {
require(modulename)(Y);
} catch (e) {
// module does not exist
if (typeof window !== 'undefined') {
var imported;
(function () {
imported = document.createElement('script');
imported.src = Y.sourceDir + '/' + modulename + '/' + modulename + extention;
document.head.appendChild(imported);
var requireModule = {};
requiringModules[modules[i]] = requireModule;
requireModule.promise = new Promise(function (resolve) {
requireModule.resolve = resolve;
});
promises.push(requireModule.promise);
})();
} else {
throw e;
}
}
} else {
promises.push(requiringModules[modules[i]].promise);

2
y.js.map
View File

File diff suppressed because one or more lines are too long