Skip to content

Commit

Permalink
Fix UUID lib (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
markdoten authored Apr 30, 2018
1 parent 4b4fd8e commit 06687bd
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
22 changes: 11 additions & 11 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "streamhub-input",
"version": "0.11.0",
"version": "0.12.0",
"main": [
"./src/main.js"
],
Expand All @@ -10,26 +10,26 @@
"inherits": "git://github.com/Livefyre/inherits.git",
"jquery": "~1.10.1",
"livefyre-bootstrap": "git://github.com/Livefyre/livefyre-bootstrap.git#1.3.4",
"livefyre-theme-styler": "git://github.com/livefyre/livefyre-theme-styler.git#1.1.0",
"observer": "git://github.com/Livefyre/Observer.git#0.1.0",
"pure-uuid": "1.5.2",
"require-less": "git://github.com/gobengo/require-less.git#deponcss",
"requirejs": "2.1.9",
"requirejs-hogan-plugin": "*",
"require-less": "git://github.com/gobengo/require-less.git#deponcss",
"rework": "gobengo/rework#0.21.0",
"stream": "git://github.com/Livefyre/stream.git#~0.1",
"streamhub-editor": "git://github.com/Livefyre/streamhub-editor.git#1.3.2",
"streamhub-sdk": "git://github.com/Livefyre/streamhub-sdk.git#2.26.4",
"view": "git://github.com/Livefyre/view.git#1.4",
"livefyre-theme-styler": "git://github.com/livefyre/livefyre-theme-styler.git#1.1.0",
"node-tiny-uuid": "git://github.com/RiveraGroup/node-tiny-uuid.git#ea7f741c9ad912d8ad2201b25fe9f5d945206386"
"streamhub-sdk": "git://github.com/Livefyre/streamhub-sdk.git#~2.31.3",
"view": "git://github.com/Livefyre/view.git#1.4"
},
"devDependencies": {
"almond": "~0.2.5",
"auth": "git://github.com/Livefyre/auth",
"auth-delegates": "Livefyre/auth-delegates#~0.4.4-beta",
"jasmine": "1.3.1",
"jasmine-jquery": "1.6.0",
"almond": "~0.2.5",
"auth-delegates": "Livefyre/auth-delegates#~0.4.4-beta",
"sinonjs": "1.7.3",
"livefyre-auth": "Livefyre/livefyre-auth"
"livefyre-auth": "Livefyre/livefyre-auth",
"sinonjs": "1.7.3"
},
"resolutions": {
"livefyre-bootstrap": "1.3.4",
Expand All @@ -39,7 +39,7 @@
"mout": "0.11.0",
"streamhub-share": "0.1.5",
"view": "1.4",
"streamhub-sdk": "2.26.4",
"streamhub-sdk": "~2.31.3",
"streamhub-editor": "1.3.2",
"cajon": "0.1.12",
"streamhub-ui": "0.4.4"
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name": "Livefyre",
"email": "[email protected]"
},
"version": "0.11.0",
"version": "0.12.0",
"scripts": {
"postinstall": "bower install",
"start": "node ./dev/server.js",
Expand All @@ -32,7 +32,6 @@
"http-server": "*",
"ink-docstrap": "git://github.com/michaelward82/docstrap.git#line-number-alignment",
"jsdoc": "git://github.com/jsdoc3/jsdoc.git",
"lfeslint": "git+ssh://[email protected]/Livefyre/lfeslint.git",
"karma": "0.10.5",
"karma-cajon": "*",
"karma-chrome-launcher": "0.1.0",
Expand All @@ -48,6 +47,7 @@
"less": "1.7.0",
"less-middleware": "0.1.15",
"lfcdn": "git+ssh://[email protected]:Livefyre/lfcdn",
"lfeslint": "git+ssh://[email protected]/Livefyre/lfeslint.git",
"phantomjs": "1.9.19",
"requirejs": "2.1.9",
"rework": "git://github.com/gobengo/rework"
Expand Down
24 changes: 12 additions & 12 deletions requirejs.conf.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
require.config({
baseUrl: '/',
paths: {
jquery: 'lib/jquery/jquery',
text: 'lib/requirejs-text/text',
base64: 'lib/base64/base64',
hogan: 'lib/hogan/web/builds/2.0.0/hogan-2.0.0.amd',
blanket: 'lib/blanket/dist/qunit/blanket',
'blanket-jasmine': 'lib/blanket/dist/jasmine/blanket_jasmine',
'event-emitter': 'lib/event-emitter/src/event-emitter',
hgn: 'lib/requirejs-hogan-plugin/hgn',
json: 'lib/requirejs-plugins/src/json',
hogan: 'lib/hogan/web/builds/2.0.0/hogan-2.0.0.amd',
inherits: 'lib/inherits/inherits',
jasmine: 'lib/jasmine/lib/jasmine-core/jasmine',
rework: 'lib/rework/rework',
'jasmine-html': 'lib/jasmine/lib/jasmine-core/jasmine-html',
'jasmine-jquery': 'lib/jasmine-jquery/lib/jasmine-jquery',
'event-emitter': 'lib/event-emitter/src/event-emitter',
'observer': 'lib/observer/src/observer',
inherits: 'lib/inherits/inherits',
blanket: 'lib/blanket/dist/qunit/blanket',
'blanket-jasmine': 'lib/blanket/dist/jasmine/blanket_jasmine',
jquery: 'lib/jquery/jquery',
json: 'lib/requirejs-plugins/src/json',
'mout': 'lib/mout/src',
'node-uuid': 'lib/node-tiny-uuid/index',
sinon: 'lib/sinonjs/sinon'
'observer': 'lib/observer/src/observer',
rework: 'lib/rework/rework',
sinon: 'lib/sinonjs/sinon',
text: 'lib/requirejs-text/text',
uuid: 'lib/pure-uuid/uuid'
},
packages: [{
name: 'stream',
Expand Down
4 changes: 2 additions & 2 deletions src/javascript/button.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var inherits = require('inherits');
var packageAttribute = require('streamhub-input/javascript/package-attribute');
var ThemeStyler = require('livefyre-theme-styler');
var themableCss = require('text!streamhub-input/styles/theme.css');
var uuid = require('node-uuid');
var UUID = require('uuid');

/**
* @param command {Command} Command to execute.
Expand Down Expand Up @@ -35,7 +35,7 @@ function InputButton(command, opts) {
* @type {string}
* @private
*/
this._uuid = uuid();
this._uuid = (new UUID(4)).toString();

/**
* The style prefix to provide to the theme styler.
Expand Down

0 comments on commit 06687bd

Please sign in to comment.