nutella_framework 0.6.12 → 0.6.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/framework_components/roomcast-bot/roomcast_bot.rb +3 -6
- data/framework_components/roomcast-channel-creator/dist/app.js +5605 -472
- data/framework_components/roomcast-channel-creator/dist/main.css +8 -2
- data/framework_components/roomcast-channel-creator/dist/nutella_lib.js +4110 -4050
- data/framework_components/roomcast-channel-creator/index.html +0 -12
- data/framework_components/roomcast-channel-creator/package.json +1 -1
- data/framework_components/roomcast-channel-creator/{dist/roomcast-default.png → roomcast-default.png} +0 -0
- data/framework_components/roomcast-channel-creator/src/app/app.js +16 -10
- data/framework_components/roomcast-channel-creator/src/app/components/main.js +2 -2
- data/framework_components/roomcast-channel-creator/src/less/main.less +7 -1
- data/framework_components/roomcast-main-app/dist/app.js +6 -5
- data/framework_components/roomcast-main-app/roomcast-default.png +0 -0
- data/framework_components/roomcast-main-app/src/app/components/app/Player.js +3 -1
- data/framework_components/roomcast-main-app/src/app/components/app/main.js +2 -3
- data/framework_components/roomcast-package-creator/dist/app.js +24 -29
- data/framework_components/roomcast-package-creator/dist/main.css +60 -1
- data/framework_components/roomcast-package-creator/roomcast-default.png +0 -0
- data/framework_components/roomcast-package-creator/src/app/app.js +1 -1
- data/framework_components/roomcast-package-creator/src/app/components/ChannelsCatalogue.js +0 -5
- data/framework_components/roomcast-package-creator/src/app/components/ConfigurationsPanel.js +0 -2
- data/framework_components/roomcast-package-creator/src/app/components/GlobalButton.js +3 -1
- data/framework_components/roomcast-package-creator/src/app/components/PoolHeader.js +1 -1
- data/framework_components/roomcast-package-creator/src/app/components/main.js +15 -13
- data/framework_components/roomcast-package-creator/src/app/components/material-ui/drop-down-menu.jsx +1 -5
- data/framework_components/roomcast-package-creator/src/app/components/material-ui/menu.jsx +2 -0
- data/framework_components/roomcast-package-creator/src/less/main.less +2 -1
- data/framework_components/roomcast-package-creator/src/less/menu-item.less +5 -3
- metadata +4 -2
|
@@ -14,18 +14,6 @@
|
|
|
14
14
|
|
|
15
15
|
<body>
|
|
16
16
|
|
|
17
|
-
<!-- Nutella -->
|
|
18
|
-
<script src="dist/nutella_lib.js" type="text/javascript" charset="utf-8"></script>
|
|
19
|
-
<script type="text/javascript">
|
|
20
|
-
|
|
21
|
-
// Parse the query parameters
|
|
22
|
-
var query_parameters = NUTELLA.parseURLParameters();
|
|
23
|
-
|
|
24
|
-
// Get an instance of nutella.
|
|
25
|
-
var nutella = NUTELLA.init(query_parameters.broker, query_parameters.app_id, query_parameters.run_id, 'channel-creation-interface');
|
|
26
|
-
|
|
27
|
-
</script>
|
|
28
|
-
|
|
29
17
|
<!-- This script adds the Roboto font to our project. For more detail go to this site: http://www.google.com/fonts#UsePlace:use/Collection:Roboto:400,300,500 -->
|
|
30
18
|
<script>
|
|
31
19
|
var WebFontConfig = {
|
|
File without changes
|
|
@@ -3,20 +3,26 @@
|
|
|
3
3
|
|
|
4
4
|
var React = require('react'),
|
|
5
5
|
injectTapEventPlugin = require("react-tap-event-plugin"),
|
|
6
|
-
Main = require('./components/main')
|
|
6
|
+
Main = require('./components/main'), // Our custom react component
|
|
7
|
+
NUTELLA = require('nutella_lib');
|
|
7
8
|
|
|
8
9
|
//Needed for React Developer Tools
|
|
9
10
|
window.React = React;
|
|
10
|
-
|
|
11
|
-
//Needed for onTouchTap
|
|
12
|
-
//Can go away when react 1.0 release
|
|
13
|
-
//Check this repo:
|
|
14
|
-
//https://github.com/zilverline/react-tap-event-plugin
|
|
15
11
|
injectTapEventPlugin();
|
|
16
12
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
13
|
+
var query_parameters = NUTELLA.parseURLParameters();
|
|
14
|
+
if(query_parameters.broker) {
|
|
15
|
+
window.nutella = NUTELLA.init(query_parameters.broker, query_parameters.app_id, query_parameters.run_id, 'roomcast-channel-creator', function(connected) {
|
|
16
|
+
if(connected) {
|
|
17
|
+
window.ReactMain = React.render( <Main /> , document.body);
|
|
18
|
+
ReactMain.imagesQueue = 0;
|
|
19
|
+
}
|
|
20
|
+
});
|
|
21
|
+
} else {
|
|
22
|
+
window.nutella = NUTELLA.init('52.1.142.215', 't1', 'default', 'roomcast-channel-creator', function(connected) {
|
|
23
|
+
window.ReactMain = React.render( <Main /> , document.body);
|
|
24
|
+
ReactMain.imagesQueue = 0;
|
|
25
|
+
});
|
|
26
|
+
}
|
|
21
27
|
|
|
22
28
|
})();
|
|
@@ -172,7 +172,7 @@ var Main = React.createClass({
|
|
|
172
172
|
channels[newChannelId] = {
|
|
173
173
|
"name": "",
|
|
174
174
|
"icon": "#00bcd4",
|
|
175
|
-
"screenshot": "
|
|
175
|
+
"screenshot": "roomcast-default.png",
|
|
176
176
|
"description": "",
|
|
177
177
|
"url": "",
|
|
178
178
|
"type": "web"
|
|
@@ -339,4 +339,4 @@ var Main = React.createClass({
|
|
|
339
339
|
|
|
340
340
|
});
|
|
341
341
|
|
|
342
|
-
module.exports = Main;
|
|
342
|
+
module.exports = Main;
|
|
@@ -60,7 +60,7 @@ html, body {
|
|
|
60
60
|
*, *:before, *:after {
|
|
61
61
|
box-sizing: inherit;
|
|
62
62
|
-webkit-touch-callout: none;
|
|
63
|
-
|
|
63
|
+
//-webkit-user-select: none;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
///////////// TopBar ///////////////////
|
|
@@ -461,6 +461,12 @@ html, body {
|
|
|
461
461
|
margin-bottom: 10px;
|
|
462
462
|
}
|
|
463
463
|
|
|
464
|
+
.mui-menu .mui-menu-item * {
|
|
465
|
+
.vendor(user-select, text);
|
|
466
|
+
}
|
|
467
|
+
|
|
468
|
+
////////////////////////////
|
|
469
|
+
|
|
464
470
|
.upload-button-container {
|
|
465
471
|
position: absolute;
|
|
466
472
|
z-index: 30;
|