Merge remote-tracking branch 'origin/master' into webserver_enhancement

Author: gaudryc

History.txt

@@ -2,12 +2,12 @@ Version 3.xxxx (March xx 2016)
 - Fixed: Database backup is now only possible for admin users
 - Fixed: Better handling of white listed commands/urls
 - Fixed: Double checking command rights
+- Fixed: Fix on/off delays not saved on the selector switch edit form (#532).
 
 Version 3.4834 (March 2nd 2016)
 - Implemented: Blockly, now possible to use expressions in notifications/email/SMS like "My temperature is {{temperaturedevice[1234]}} degrees" (see http://www.domoticz.com/wiki/Events)
 - Implemented: Blockly, now possible to send a notification with a user variable/device as subject/body
 - Implemented: Chinese language support, big thanks to wxws!!
-- Implemented: CounterType 'Time'
 - Implemented: Custom Templates, now possible to directly call custom template pages (http://127.0.0.1:8080/#/Custom/mypage)
 - Implemented: Day display in energy/gas/water/temp report
 - Implemented: Dummy Hardware, Option to supply name, sensor is now also directly added to the system

www/app/DashboardController.js

@@ -417,6 +417,7 @@ define(['app'], function (app) {
 														.find('label')
 															.removeClass('ui-state-active')
 															.removeClass('ui-state-focus')
+															.removeClass('ui-state-hover')
 															.end()
 														.find('input:radio')
 															.removeProp('checked')

www/app/LightsController.js

@@ -979,7 +979,7 @@ define(['app'], function (app) {
 					if (switchtype==8) {
 						addjvalstr="&addjvalue=" + $("#lightcontent #motionoffdelay").val();
 					}
-					else if ((switchtype==0)||(switchtype==7)||(switchtype==9)||(switchtype==11)) {
+					else if ((switchtype==0)||(switchtype==7)||(switchtype==9)||(switchtype==11)||(switchtype==18)) {
 						addjvalstr="&addjvalue=" + $("#lightcontent #offdelay").val();
 						addjvalstr+="&addjvalue2=" + $("#lightcontent #ondelay").val();
 					}
@@ -2333,6 +2333,7 @@ define(['app'], function (app) {
 										.find('label')
 											.removeClass('ui-state-active')
 											.removeClass('ui-state-focus')
+											.removeClass('ui-state-hover')
 											.end()
 										.find('input:radio')
 											.removeProp('checked')

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1222
+# ref 1225
 
 CACHE:
 # CSS