Merge develop into clean-widget

Author: lucguinchard

assets/js/desktop/pages/dashboard.js

@@ -70,7 +70,7 @@ function selectCategory(_selectedCategory, _selectedIcon) {
  */
 function editWidgetMode(_mode, _save) {
     if (!isset(_mode)) {
-        if ($('#bt_editDashboardWidgetOrder').attr('data-mode') !== undefined && $('#bt_editDashboardWidgetOrder').attr('data-mode') === 1) {
+        if ($('#bt_editDashboardWidgetOrder').attr('data-mode') !== undefined && $('#bt_editDashboardWidgetOrder').attr('data-mode') === '1') {
             editWidgetMode(0, false);
             editWidgetMode(1, false);
         }
@@ -305,7 +305,7 @@ function orderItems() {
           $(itemElems).each(function (i, itemElem) {
               $(itemElem).attr('data-order', i + 1);
               value = i + 1;
-              if ($('#bt_editDashboardWidgetOrder').attr('data-mode') === 1) {
+              if ($('#bt_editDashboardWidgetOrder').attr('data-mode') === '1') {
                   if ($(itemElem).find(".card-order-number").length) {
                       $(itemElem).find(".card-order-number").text(value);
                   } else {

assets/js/desktop/pages/dashboard_events.js

@@ -64,7 +64,7 @@ function loadInformations() {
  */
 function initEvents() {
     // Opening welcome modal if not saved "not display anymore"
-    if (typeof(nextdom_Welcome)!== 'undefined' && isset(nextdom_Welcome) && nextdom_Welcome === 1 && getUrlVars('noWelcome') != 1) {
+    if (typeof(nextdom_Welcome)!== 'undefined' && isset(nextdom_Welcome) && nextdom_Welcome === 1 && getUrlVars('noWelcome') !== '1') {
         loadModal('modal', '{{Bienvenue dans NextDom}}', 'welcome');
     }
 
@@ -78,7 +78,7 @@ function initEvents() {
 
     // Dashboard edition mode button
     $('#bt_editDashboardWidgetOrder').on('click', function () {
-        if ($(this).attr('data-mode') === 1) {
+        if ($(this).attr('data-mode') === '1') {
             $.hideAlert();
             $(this).attr('data-mode', 0);
             editWidgetMode(0);

assets/js/libs/widget.js

@@ -5,7 +5,7 @@
  */
 function editWidgetCmdMode(_mode) {
   if (!isset(_mode)) {
-    if ($('#bt_editDashboardWidgetOrder').attr('data-mode') !== undefined && $('#bt_editDashboardWidgetOrder').attr('data-mode') === 1) {
+    if ($('#bt_editDashboardWidgetOrder').attr('data-mode') !== undefined && $('#bt_editDashboardWidgetOrder').attr('data-mode') === '1') {
       editWidgetMode(0);
       editWidgetMode(1);
     }
@@ -239,7 +239,7 @@ function saveWidgetDisplay(_params) {
       order++;
     });
   });
-  if (init(_params['dashboard']) === 1) {
+  if (init(_params['dashboard']) == 1) {
     $('.div_displayEquipement').each(function () {
       order = 1;
       $(this).find('.eqLogic-widget').each(function () {