Deploy 12.1.5

Deploy 12.1.4
Deploy 12.1.3
2017-03-06 13:27:26 +01:00 · 2016-12-19 10:41:55 +01:00 · 2016-11-22 13:12:32 +01:00 · 2016-11-21 16:28:20 +01:00 · 2016-11-16 18:08:01 +01:00 · 2016-11-14 16:29:04 +01:00
10 changed files with 134 additions and 29 deletions
--- a/Examples/Ace/index.html
+++ b/Examples/Ace/index.html
@@ -2,7 +2,7 @@
 <html>
  <head>
    <style type="text/css" media="screen">
-    #ace { 
+    #aceContainer {
        position: absolute;
        top: 0;
        right: 0;
@@ -23,7 +23,7 @@
  </head>
  <body>
-    <div id="ace"></div>
+    <div id="aceContainer"></div>
    <script src="../bower_components/yjs/y.es6"></script>
    <script src="../bower_components/ace-builds/src/ace.js"></script>
--- a/Examples/Ace/index.js
+++ b/Examples/Ace/index.js
@@ -17,7 +17,7 @@ Y({
  window.yAce = y
  // bind the textarea to a shared text element
-  var editor = ace.edit('ace')
+  var editor = ace.edit('aceContainer')
  editor.setTheme('ace/theme/chrome')
  editor.getSession().setMode('ace/mode/javascript')
--- a/Examples/WebWorker/index.html
+++ b/Examples/WebWorker/index.html
@@ -0,0 +1,31 @@
 <!DOCTYPE html>
 <html>
 <head>
  <!-- quill does not include dist files! We are using the hosted version instead -->
  <!--link rel="stylesheet" href="../bower_components/quill/dist/quill.snow.css" /-->
  <link href="https://cdn.quilljs.com/1.0.4/quill.snow.css" rel="stylesheet">
  <link href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.css" rel="stylesheet"> 
  <link href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/styles/monokai-sublime.min.css" rel="stylesheet">
  <style>
    #quill-container {
      border: 1px solid gray;
      box-shadow: 0px 0px 10px gray;
    }
  </style>
 </head>
 <body>
  <div id="quill-container">
    <div id="quill">
    </div>
  </div>
  <script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js" type="text/javascript"></script>
  <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.2.0/highlight.min.js" type="text/javascript"></script>
  <script src="https://cdn.quilljs.com/1.0.4/quill.js"></script>
  <!-- quill does not include dist files! We are using the hosted version instead (see above)
  <script src="../bower_components/quill/dist/quill.js"></script>
  -->
  <script src="../bower_components/yjs/y.es6"></script>
  <script src="./index.js"></script>
 </body>
 </html>
--- a/Examples/WebWorker/index.js
+++ b/Examples/WebWorker/index.js
@@ -0,0 +1,39 @@
 /* global Y, Quill */
 // initialize a shared object. This function call returns a promise!
 Y({
  db: {
    name: 'memory'
  },
  connector: {
    name: 'webworker',
    url: '../bower_components/y-webworker/yjs-webworker.js',
    room: 'WebWorkerExample2'
  },
  sourceDir: '/bower_components',
  share: {
    richtext: 'Richtext' // y.share.richtext is of type Y.Richtext
  }
 }).then(function (y) {
  window.yQuill = y
  // create quill element
  window.quill = new Quill('#quill', {
    modules: {
      formula: true,
      syntax: true,
      toolbar: [
        [{ size: ['small', false, 'large', 'huge'] }],
        ['bold', 'italic', 'underline'],
        [{ color: [] }, { background: [] }],    // Snow theme fills in values
        [{ script: 'sub' }, { script: 'super' }],
        ['link', 'image'],
        ['link', 'code-block'],
        [{list: 'ordered' }]
      ]
    },
    theme: 'snow'
  })
  // bind quill to richtext type
  y.share.richtext.bind(window.quill)
 })
--- a/README.md
+++ b/README.md
@@ -41,6 +41,12 @@ Connectors, Databases, and Types are available as modules that extend Yjs. Here
 |[text](https://github.com/y-js/y-text) | Collaborate on text. Supports two way binding to the [Ace Editor](https://ace.c9.io), textareas, input elements, and HTML elements (e.g. <*h1*>, or <*p*>) |
 |[richtext](https://github.com/y-js/y-richtext) | Collaborate on rich text. Supports two way binding to the [Quill Rich Text Editor](http://quilljs.com/)|
 ##### Other
 | Name      | Description       |
 |-----------|-------------------|
 |[y-element](http://y-js.org/y-element/) | Yjs Polymer Element |
 ## Use it!
 Install Yjs, and its modules with [bower](http://bower.io/), or [npm](https://www.npmjs.org/package/yjs).
@@ -145,6 +151,7 @@ Report _any_ issues to the [Github issue page](https://github.com/y-js/yjs/issue
  * All our connectors implement a `room` property. Clients that specify the same room share the same data.
  * All of our connectors specify an `url` property that defines the connection endpoint of the used connector.
    * All of our connectors also have a default connection endpoint that you can use for development.
  * Set `options.connector.generateUserId = true` in order to genenerate a userid, instead of receiving one from the server. This way the `Y(..)` is immediately going to be resolved, without waiting for any confirmation from the server. Use with caution.
  * Have a look at the used connector repository to see all available options.
 * options.sourceDir (browser only)
  * Path where all y-* modules are stored
@@ -267,4 +274,3 @@ I created this framework during my bachelor thesis at the chair of computer scie
 Yjs is licensed under the [MIT License](./LICENSE).
 <yjs@dbis.rwth-aachen.de>
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "yjs",
-  "version": "12.1.2",
+  "version": "12.1.5",
  "homepage": "y-js.org",
  "authors": [
    "Kevin Jahns <kevin.jahns@rwth-aachen.de>"
--- a/y.es6
+++ b/y.es6
@@ -1,4 +1,10 @@
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+/**
 * yjs - A framework for real-time p2p shared editing on any data
 * @version v12.1.4
 * @link http://y-js.org
 * @license MIT
 */
 (function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Y = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 /* @flow */
 'use strict'
@@ -60,6 +66,18 @@ module.exports = function (Y/* :any */) {
      this.protocolVersion = 11
      this.authInfo = opts.auth || null
      this.checkAuth = opts.checkAuth || function () { return Promise.resolve('write') } // default is everyone has write access
      if (opts.generateUserId === true) {
        this.setUserId(Y.utils.generateGuid())
      }
    }
    resetAuth (auth) {
      if (this.authInfo !== auth) {
        this.authInfo = auth
        this.broadcast({
          type: 'auth',
          auth: this.authInfo
        })
      }
    }
    reconnect () {
    }
@@ -297,7 +315,6 @@ module.exports = function (Y/* :any */) {
                  type: 'sync done'
                })
              }
              conn._setSyncedWith(sender)
            })
          } else if (message.type === 'sync step 2' && canWrite(auth)) {
            let conn = this
@@ -826,6 +843,8 @@ module.exports = function (Y /* :any */) {
    }
    stopGarbageCollector () {
      var self = this
      this.gc = false
      this.gcTimeout = -1
      return new Promise(function (resolve) {
        self.requestTransaction(function * () {
          var ungc /* :Array<Struct> */ = self.gc1.concat(self.gc2)
@@ -1506,7 +1525,7 @@ module.exports = function (Y/* :any */) {
        }
        // try to merge original op.left and op.origin
-        for (let i = 0; i < tryToRemergeLater.length; i++) {
+        for (i = 0; i < tryToRemergeLater.length; i++) {
          var m = yield* this.getOperation(tryToRemergeLater[i])
          yield* this.tryCombineWithLeft(m)
        }
@@ -2022,6 +2041,9 @@ module.exports = function (Y/* :any */) {
      if (this.store.gc1.length > 0 || this.store.gc2.length > 0) {
        console.warn('gc should be empty after sync')
      }
      if (!this.store.gc) {
        return
      }
      yield* this.os.iterate(this, null, null, function * (op) {
        if (op.gc) {
          delete op.gc
@@ -3452,6 +3474,11 @@ module.exports = function (Y /* : any*/) {
    return SmallLookupBuffer
  }
  Y.utils.createSmallLookupBuffer = createSmallLookupBuffer
  // Generates a unique id, for use as a user id.
  // Thx to @jed for this script https://gist.github.com/jed/982883
  function generateGuid(a){return a?(a^Math.random()*16>>a/4).toString(16):([1e7]+-1e3+-4e3+-8e3+-1e11).replace(/[018]/g,generateGuid)} // eslint-disable-line
  Y.utils.generateGuid = generateGuid
 }
 },{}],7:[function(require,module,exports){
@@ -3580,7 +3607,6 @@ function Y (opts/* :YOptions */) /* :Promise<YConfig> */ {
    else if (opts.connector.name == null) reject('You must specify connector name! (missing connector.name 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 db name! (missing db.name property)')
    else if (opts.share == null) reject('You must specify a set of shared types!')
    else {
      opts = Y.utils.copyObject(opts)
      opts.connector = Y.utils.copyObject(opts.connector)
@@ -3692,9 +3718,6 @@ class YConfig {
  }
 }
-if (typeof window !== 'undefined') {
+},{"./Connector.js":1,"./Connectors/Test.js":2,"./Database.js":3,"./Struct.js":4,"./Transaction.js":5,"./Utils.js":6}]},{},[7])(7)
-  window.Y = Y
+});
 }
 },{"./Connector.js":1,"./Connectors/Test.js":2,"./Database.js":3,"./Struct.js":4,"./Transaction.js":5,"./Utils.js":6}]},{},[7])
--- a/y.es6.map
+++ b/y.es6.map
--- a/y.js
+++ b/y.js
--- a/y.js.map
+++ b/y.js.map
Author	SHA1	Message	Date
Kevin Jahns	e1108d4007	Deploy 12.1.5	2017-03-06 13:27:26 +01:00
Kevin Jahns	c00dee819f	Deploy 12.1.4	2016-12-19 10:41:55 +01:00
Kevin Jahns	92b9cb8143	Deploy 12.1.3	2016-11-22 13:12:32 +01:00
Kevin Jahns	5dad1ed410	update webworker example	2016-11-21 16:28:20 +01:00
Kevin Jahns	b613630cef	improved examples	2016-11-16 18:08:01 +01:00
Kevin Jahns	afa05b62a1	added sw example	2016-11-14 16:29:04 +01:00