Clean deprecated / obsolete !

jeedom · Nov 4, 2022 · 48abf73 · 48abf73
1 parent c257abc
commit 48abf73
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 67 deletions.
diff --git a/core/php/utils.inc.php b/core/php/utils.inc.php
@@ -237,11 +237,6 @@ function mySqlIsHere() {
 	return is_object(DB::getConnection());
 }
 
-function displayExeption($e) {
-	trigger_error('La fonction displayExeption devient displayException', E_USER_DEPRECATED);
-	return displayException($e);
-}
-
 function displayException($e) {
 	$message = '<span id="span_errorMessage">' . $e->getMessage() . '</span>';
 	if (DEBUG) {
@@ -729,11 +724,6 @@ function date_fr($date_en) {
 	return preg_replace($texte_short_day_en, $texte_short_day, preg_replace($texte_short_month_en, $texte_short_month, preg_replace($texte_long_en, $texte_long, $date_en)));
 }
 
-function convertDayEnToFr($_day) {
-	trigger_error('La fonction convertDayEnToFr devient convertDayFromEn', E_USER_DEPRECATED);
-	return convertDayFromEn($_day);
-}
-
 function convertDayFromEn($_day) {
 	$result = $_day;
 	$daysMapping = array(

diff --git a/desktop/common/js/utils.js b/desktop/common/js/utils.js
@@ -1125,7 +1125,7 @@ jeedomUtils.rgbToHex = function(r, g, b) {
   return "#" + jeedomUtils.componentToHex(r) + jeedomUtils.componentToHex(g) + jeedomUtils.componentToHex(b)
 }
 
-jeedomUtils.addOrUpdateUrl = function(_param,_value,_title) {
+jeedomUtils.addOrUpdateUrl = function(_param, _value, _title) {
   var url = new URL(window.location.href)
   var query_string = url.search
   var search_params = new URLSearchParams(query_string)
@@ -1576,35 +1576,59 @@ jeedomUtils.deprecatedFunc = function(_version='4.3', _oldFunc, _newFunc, _names
   } else {
     var newName = _newFunc.name
   }
+  var msg = `JEEDOM WARNING! Deprecated function since Core v${_version} called: Please use the new ${newName}() function instead!`
   const wrapper = function() {
-    console.error(`JEEDOM WARNING! Deprecated function since Core v${_version} called: Please use the new ${newName}() function instead!`)
+    console.error(msg)
     _newFunc.apply(this, arguments)
   }
+
+  var jsError = {
+    filename: 'utils.js',
+    lineno: 'unknown',
+    message: msg,
+  }
+  jeedomUtils.JS_ERROR.push(jsError)
+  $('#bt_jsErrorModal').show()
+
   wrapper.prototype = _newFunc.prototype
   return wrapper
 }
 
 //Introduced in v4.2 -> deprecated v4.4 -> obsolete v4.5
-var checkPageModified = jeedomUtils.checkPageModified
-var loadPage = jeedomUtils.loadPage
-var initPage = jeedomUtils.initPage
-var initTooltips = jeedomUtils.initTooltips
-var initTableSorter = jeedomUtils.initTableSorter
-var initHelp = jeedomUtils.initHelp
-var datePickerInit = jeedomUtils.datePickerInit
-var normTextLower = jeedomUtils.normTextLower
-var sleep = jeedomUtils.sleep
-var uniqId = jeedomUtils.uniqId
-var taAutosize = jeedomUtils.taAutosize
-var hexToRgb = jeedomUtils.hexToRgb
-var componentToHex = jeedomUtils.componentToHex
-var rgbToHex = jeedomUtils.rgbToHex
-var addOrUpdateUrl = jeedomUtils.addOrUpdateUrl
-var positionEqLogic = jeedomUtils.positionEqLogic
-var chooseIcon = jeedomUtils.chooseIcon
-var getOpenedModal = jeedomUtils.getOpenedModal
-
-
-//Introduced in v4.3 -> obsolete 4.4
-var jeedom_langage = jeeFrontEnd.language
-var userProfils = jeeFrontEnd.userProfils
+//var checkPageModified = jeedomUtils.checkPageModified
+function checkPageModified() { return jeedomUtils.deprecatedFunc('4.4', checkPageModified, 'checkPageModified', 'jeedomUtils')(); }
+//var loadPage = jeedomUtils.loadPage
+function loadPage(_url, _noPushHistory) { return jeedomUtils.deprecatedFunc('4.4', loadPage, 'loadPage', 'jeedomUtils')(); }
+//var initPage = jeedomUtils.initPage
+function initPage() { return jeedomUtils.deprecatedFunc('4.4', initPage, 'initPage', 'jeedomUtils')(); }
+//var initTooltips = jeedomUtils.initTooltips
+function initTooltips(_el) { return jeedomUtils.deprecatedFunc('4.4', initTooltips, 'initTooltips', 'jeedomUtils')(); }
+//var initTableSorter = jeedomUtils.initTableSorter
+function initTableSorter(filter) { return jeedomUtils.deprecatedFunc('4.4', initTableSorter, 'initTableSorter', 'jeedomUtils')(); }
+//var initHelp = jeedomUtils.initHelp
+function initHelp() { return jeedomUtils.deprecatedFunc('4.4', initHelp, 'initHelp', 'jeedomUtils')(); }
+//var datePickerInit = jeedomUtils.datePickerInit
+function datePickerInit() { return jeedomUtils.deprecatedFunc('4.4', datePickerInit, 'datePickerInit', 'jeedomUtils')(); }
+//var normTextLower = jeedomUtils.normTextLower
+function normTextLower(_text) { return jeedomUtils.deprecatedFunc('4.4', normTextLower, 'normTextLower', 'jeedomUtils')(); }
+//var sleep = jeedomUtils.sleep
+function sleep(milliseconds) { return jeedomUtils.deprecatedFunc('4.4', sleep, 'sleep', 'jeedomUtils')(); }
+//var uniqId = jeedomUtils.uniqId
+function uniqId(_prefix) { return jeedomUtils.deprecatedFunc('4.4', uniqId, 'uniqId', 'jeedomUtils')(); }
+//var taAutosize = jeedomUtils.taAutosize
+function taAutosize() { return jeedomUtils.deprecatedFunc('4.4', taAutosize, 'taAutosize', 'jeedomUtils')(); }
+//var hexToRgb = jeedomUtils.hexToRgb
+function hexToRgb(hex) { return jeedomUtils.deprecatedFunc('4.4', hexToRgb, 'hexToRgb', 'jeedomUtils')(); }
+//var componentToHex = jeedomUtils.componentToHex
+function componentToHex(c) { return jeedomUtils.deprecatedFunc('4.4', componentToHex, 'componentToHex', 'jeedomUtils')(); }
+//var rgbToHex = jeedomUtils.rgbToHex
+function rgbToHex(r, g, b) { return jeedomUtils.deprecatedFunc('4.4', rgbToHex, 'rgbToHex', 'jeedomUtils')(); }
+//var addOrUpdateUrl = jeedomUtils.addOrUpdateUrl
+function addOrUpdateUrl(_param,_value,_title) { return jeedomUtils.deprecatedFunc('4.4', addOrUpdateUrl, 'addOrUpdateUrl', 'jeedomUtils')(); }
+//var positionEqLogic = jeedomUtils.positionEqLogic
+function positionEqLogic(_id, _preResize, _scenario) { return jeedomUtils.deprecatedFunc('4.4', positionEqLogic, 'positionEqLogic', 'jeedomUtils')(); }
+//var chooseIcon = jeedomUtils.chooseIcon
+function chooseIcon(_callback, _params) { return jeedomUtils.deprecatedFunc('4.4', chooseIcon, 'chooseIcon', 'jeedomUtils')(); }
+//var getOpenedModal = jeedomUtils.getOpenedModal
+function getOpenedModal() { return jeedomUtils.deprecatedFunc('4.4', getOpenedModal, 'getOpenedModal', 'jeedomUtils')(); }
+
diff --git a/desktop/js/plan.js b/desktop/js/plan.js
@@ -720,19 +720,6 @@ if (!jeeFrontEnd.plan) {
 
 jeeFrontEnd.plan.init()
 
-//deprecated v4.3 -> removed v4.4
-var displayPlan = function() {
-  if (isset(planHeader_id)) {
-    jeephp2js.planHeader_id = planHeader_id
-  }
-  jeeFrontEnd.plan.displayPlan()
-  var event = new Event('error')
-  event.filename = 'desktop/js/plan.js'
-  event.message = 'Deprecated use of displayPlan(), use jeeFrontEnd.plan.displayPlan() with jeephp2js.planHeader_id instead.'
-  window.dispatchEvent(event)
-}
-
-
 var clickedOpen = false
 var style_css = ''
 for (var i in jeephp2js.planHeader) {

diff --git a/mobile/js/application.js b/mobile/js/application.js
@@ -757,22 +757,3 @@ jeedomUtils.normTextLower = function(_text) {
   return _text.normalize('NFD').replace(/[\u0300-\u036f]/g, "").toLowerCase()
 }
 
-//deprecated, remove v4.3
-function refreshUpdateNumber() {
-  jeedomUtils.refreshMessageNumber()
-}
-function positionEqLogic(_id) {
-  jeedomUtils.positionEqLogic(_id)
-}
-function setTileSize(_filter) {
-  jeedomUtils.setTileSize(_filter)
-}
-function panel(_name, _callback) {
-  jeedomUtils.loadPanel(_name, _callback)
-}
-function setBackgroundImage(_path){
-  jeedomUtils.setBackgroundImage(_path)
-}
-
-//deprecated, remove v4.4
-var page = jeedomUtils.loadPage