Skip to content

Commit 48c2b5b

Browse files
committed
### 3.4.0 (2017-08-06)
* (bluefox) Support of new admin
1 parent 39c9e5b commit 48c2b5b

File tree

5 files changed

+17
-9
lines changed

5 files changed

+17
-9
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,9 @@ There is a possibility to enabled and disable scripts via states. For every scri
10101010
Scripts can be activated and deactivated by controlling of this state with ack=false.
10111011

10121012
## Changelog
1013+
### 3.4.0 (2017-08-06)
1014+
* (bluefox) Support of new admin
1015+
10131016
### 3.3.12 (2017-07-24)
10141017
* (bluefox) file and line info added to log outputs
10151018

admin/tab.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<html>
22
<header>
33
<!-- these 4 files always have to be included -->
4-
<link rel="stylesheet" type="text/css" href="../../lib/css/themes/jquery-ui/redmond/jquery-ui.min.css"/>
4+
<link rel="stylesheet" type="text/css" href="../../lib/css/themes/jquery-ui/default/jquery-ui.min.css"/>
55
<!--link rel="stylesheet" type="text/css" href="../../lib/css/jqGrid/ui.jqgrid-4.5.4.css"/-->
66
<!--link rel="stylesheet" type="text/css" href="cron/jquery-cron.css"/-->
77
<link rel="stylesheet" type="text/css" href="../../lib/css/fancytree/ui.fancytree.min.css"/>
88
<link rel="stylesheet" type="text/css" href="jquery.cron.css"/>
99

10-
<script type="text/javascript" src="../../lib/js/jquery-1.11.1.min.js"></script>
11-
<script type="text/javascript" src="../../lib/js/jquery-ui.min.js"></script>
10+
<script type="text/javascript" src="../../lib/js/jquery-1.11.2.min.js"></script>
11+
<script type="text/javascript" src="../../lib/js/jquery-ui-1.11.4.full.min.js"></script>
1212
<script type="text/javascript" src="../../socket.io/socket.io.js"></script>
1313
<script type="text/javascript" src="../../lib/js/loStorage.js"></script>
1414
<!--script type="text/javascript" src="../../lib/js/jqGrid/jquery.jqGrid-4.5.4.min.js"></script>
1515
<script type="text/javascript" src="../../lib/js/jqGrid/grid.locale-all.js"></script-->
1616
<script type="text/javascript" src="../../lib/js/ace-1.2.0/ace.js"></script>
17-
<script type="text/javascript" src="../../js/translate.js"></script>
17+
<script type="text/javascript" src="../../lib/js/translate.js"></script>
1818
<script type="text/javascript" src="words.js"></script>
1919

2020
<script type="text/javascript" src="../../lib/js/jquery.fancytree-all.min.js"></script>
@@ -33,7 +33,7 @@
3333
<script type="text/javascript" src="google-blockly/own/blocks_trigger.js"></script>
3434
<script type="text/javascript" src="google-blockly/own/blocks_procedures.js"></script>
3535
<script type="text/javascript" src="google-blockly/own/blocks_timeout.js"></script>
36-
<script type="text/javascript" src="../../js/selectID.js"></script>
36+
<script type="text/javascript" src="../../lib/js/selectID.js"></script>
3737

3838
<!--script type="text/javascript" src="cron/jquery-cron.js"></script-->
3939
<script type="text/javascript" src="cron2text.js"></script>

admin/tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,7 @@ function getStates(callback) {
25852585
}
25862586

25872587
function getObjects(callback) {
2588-
main.socket.emit('getObjects', function (err, res) {
2588+
main.socket.emit('getAllObjects', function (err, res) {
25892589
setTimeout(function () {
25902590
var obj;
25912591
main.objects = res;

io-package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"common": {
33
"name": "javascript",
4-
"version": "3.3.12",
4+
"version": "3.4.0",
55
"title": "Javascript/Blockly Script Engine",
66
"titleLang": {
77
"en": "Javascript/Blockly Script Engine",
@@ -14,6 +14,11 @@
1414
"ingo@fischer-ka.de"
1515
],
1616
"news": {
17+
"3.4.0": {
18+
"en": "Support of new admin",
19+
"de": "Unterstützung von neuen Admin",
20+
"ru": "Поддержка нового admin"
21+
},
1722
"3.3.12": {
1823
"en": "file and line info added to log outputs",
1924
"de": "Datei- und Zeilen-Info zu Log-Ausgaben hinzugefügt",
@@ -133,7 +138,7 @@
133138
"singleton": true,
134139
"name": "Scripts"
135140
},
136-
"dependencies": [{"js-controller": ">=0.10.0"}],
141+
"dependencies": [{"js-controller": ">=0.10.0"}, {"admin": ">=2.0.0"}],
137142
"type": "script"
138143
},
139144
"native": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "iobroker.javascript",
3-
"version": "3.3.12",
3+
"version": "3.4.0",
44
"description": "Javascript/Coffescript Script Engine for ioBroker",
55
"author": "bluefox <dogafox@gmail.com>",
66
"contributors": [

0 commit comments

Comments
 (0)