FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

codemirror: added current fhem.js

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5484 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2014-04-08 10:06:38 +00:00
parent c0a4943fca
commit 7a86507d28
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/www/codemirror/fhem.js
View File

@ -843,20 +843,16 @@ var keywords = ["at","attr","define","delete","deleteattr","deletereading","disp
"AttrVal","OldTimestamp","OldValue","ReadingsVal","ReadingsTimestamp","Value"]; "AttrVal","OldTimestamp","OldValue","ReadingsVal","ReadingsTimestamp","Value"];
var variables = ["$defs","$hms","$hour","$isdst","$mday","$min","$month","$sec","$wday","$we","$yday","$year"]; var variables = ["$defs","$hms","$hour","$isdst","$mday","$min","$month","$sec","$wday","$we","$yday","$year"];
var devices = []; var devices = [];
var devtypes = [];
CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, options) { CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, options) {
if( devices.length == 0 ) { if( devices.length == 0 ) {
$.getJSON( '/fhem?cmd=jsonlist&XHR=1', function ( data ) { $.getJSON( '/fhem?cmd=jsonlist2&XHR=1', function ( data ) {
data.Results.foreach( function(k,v) { data.Results.foreach( function(k,v) {
devtypes.push(v); devices.push(v);
v.devices.foreach( function(m,n) {
devices.push(n);
});
}); });
devices.sort(function (a, b) { devices.sort(function (a, b) {
return a.NAME.toLowerCase().localeCompare(b.NAME.toLowerCase()); return a.Name.toLowerCase().localeCompare(b.Name.toLowerCase());
}); });
hintfhem(cm,callback,options); hintfhem(cm,callback,options);
}); });
@ -931,7 +927,7 @@ CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, option
function getDeviceAttributes(device) { function getDeviceAttributes(device) {
var attrs = []; var attrs = [];
if( device != null ) { if( device != null ) {
device.attrs.foreach(function(k,v) { device.PossibleAttrs.split(' ').foreach(function(k,v) {
attrs.push(v.split(':')[0]); attrs.push(v.split(':')[0]);
}); });
attrs.sort(function (a, b) { attrs.sort(function (a, b) {
@ -944,7 +940,7 @@ CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, option
function getDeviceSets(device) { function getDeviceSets(device) {
var attrs = []; var attrs = [];
if( device != null ) { if( device != null ) {
device.sets.foreach(function(k,v) { device.PossibleSets.split(' ').foreach(function(k,v) {
attrs.push(v.split(':')[0]); attrs.push(v.split(':')[0]);
}); });
attrs.sort(function (a, b) { attrs.sort(function (a, b) {
@ -957,13 +953,9 @@ CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, option
function getDeviceReadings(device) { function getDeviceReadings(device) {
var readings = []; var readings = [];
if( device != null ) { if( device != null ) {
device.READINGS.foreach(function(k,v) { for( var key in device.Readings ) {
for( var key in v ) { readings.push(key);
if( key != "measured" ) { }
readings.push(key);
}
}
});
readings.sort(function (a, b) { readings.sort(function (a, b) {
return a.toLowerCase().localeCompare(b.toLowerCase()); return a.toLowerCase().localeCompare(b.toLowerCase());
}); });
@ -977,7 +969,7 @@ CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, option
middle = Math.floor((stopIndex + startIndex)/2); middle = Math.floor((stopIndex + startIndex)/2);
var iname = null; var iname = null;
name = name.toLowerCase(); name = name.toLowerCase();
while( (iname = items[middle].NAME.toLowerCase()) != name && startIndex < stopIndex){ while( (iname = items[middle].Name.toLowerCase()) != name && startIndex < stopIndex){
//adjust search area //adjust search area
if (name < iname){ if (name < iname){
stopIndex = middle - 1; stopIndex = middle - 1;
@ -998,12 +990,12 @@ CodeMirror.registerHelper("hint", "fhem", function hintfhem(cm, callback, option
res.push({text:v,className:"hintkeyword"}); res.push({text:v,className:"hintkeyword"});
}); });
devs.foreach( function( k, v ) { devs.foreach( function( k, v ) {
if( v.NAME.lastIndexOf(word,0)==0) { if( v.Name.lastIndexOf(word,0)==0) {
if( v.ATTR && v.ATTR.alias != null) { if( v.Attributes && v.Attributes.alias != null) {
res.push({ text:v.NAME, displayText: v.NAME + " # " + v.ATTR.alias}); res.push({ text:v.Name, displayText: v.Name + " # " + v.Attributes.alias});
} }
else { else {
res.push(v.NAME); res.push(v.Name);
} }
} }
}); });