From d2fa5e8f70d1ebc94ee1fe1064a343a71a12c9c9 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 9 May 2016 11:41:02 +0200 Subject: [PATCH] start using hyperjson from bower.io --- bower.json | 3 ++- www/pad/main.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index 6883d1107..caa00008b 100644 --- a/bower.json +++ b/bower.json @@ -30,6 +30,7 @@ "marked": "~0.3.5", "rangy": "rangy-release#~1.3.0", "json.sortify": "~2.1.0", - "fabric.js": "fabric#~1.6.0" + "fabric.js": "fabric#~1.6.0", + "hyperjson": "~1.1.0" } } diff --git a/www/pad/main.js b/www/pad/main.js index aed4612cc..84656c3d3 100644 --- a/www/pad/main.js +++ b/www/pad/main.js @@ -4,7 +4,7 @@ define([ '/common/messages.js', '/common/crypto.js', '/common/realtime-input.js', - '/common/hyperjson.js', + '/bower_components/hyperjson/hyperjson.js', '/common/hyperscript.js', '/common/toolbar.js', '/common/cursor.js', @@ -37,6 +37,7 @@ define([ var module = window.REALTIME_MODULE = { Hyperjson: Hyperjson, Hyperscript: Hyperscript, + TextPatcher: TextPatcher, logFights: true, fights: [] };