diff --git a/src/mibew/js/source/widget.js b/src/mibew/js/source/widget.js index 633a6f54..7cc29bdf 100644 --- a/src/mibew/js/source/widget.js +++ b/src/mibew/js/source/widget.js @@ -49,11 +49,11 @@ var Mibew = {}; this.handlers = []; /** - * List of dependences between handlers and scripts + * List of dependencies between handlers and scripts * @type Object * @private */ - this.handlersDependences = {}; + this.handlersDependencies = {}; /** * URL for requests @@ -186,7 +186,7 @@ var Mibew = {}; var load = response.load; var handlers = response.handlers; var data = response.data; - var dependences = response.dependences; + var dependencies = response.dependencies; var context = this; // Update list of scripts that must be loaded @@ -203,18 +203,18 @@ var Mibew = {}; } } - // Update list of dependences - for(var handler in dependences){ - if (! dependences.hasOwnProperty(handler)) { + // Update list of dependencies + for(var handler in dependencies){ + if (! dependencies.hasOwnProperty(handler)) { continue; } - // Check if dependences for this handler already stored - if (! (handler in this.handlersDependences)) { - this.handlersDependences[handler] = dependences[handler]; + // Check if dependencies for this handler already stored + if (! (handler in this.handlersDependencies)) { + this.handlersDependencies[handler] = dependencies[handler]; } } - // Process all recieved handlers. Run handler if all dependences loaded + // Process all recieved handlers. Run handler if all dependencies loaded // and add it to handlers list otherwise. for (var i = 0; i < handlers.length; i++) { // Create shortcuts @@ -291,7 +291,7 @@ var Mibew = {}; /** * Event listener for script onLoad event. Run handlers which have no - * unload dependences. + * unload dependencies. * @param {String} id Identifier of the loaded script */ Mibew.Widget.prototype.scriptReady = function(id) { @@ -311,10 +311,10 @@ var Mibew = {}; * Check if handler can be run */ Mibew.Widget.prototype.canRunHandler = function(handlerName) { - var dependences = this.handlersDependences[handlerName]; - // Check for dependencess - for(var i = 0; i < dependences.length; i++){ - if(this.requestedScripts[dependences[i]].status != 'ready'){ + var dependencies = this.handlersDependencies[handlerName]; + // Check for dependencies + for(var i = 0; i < dependencies.length; i++){ + if(this.requestedScripts[dependencies[i]].status != 'ready'){ return false; } } diff --git a/src/mibew/libs/classes/Mibew/Controller/WidgetController.php b/src/mibew/libs/classes/Mibew/Controller/WidgetController.php index 068a59fa..986dbaf2 100644 --- a/src/mibew/libs/classes/Mibew/Controller/WidgetController.php +++ b/src/mibew/libs/classes/Mibew/Controller/WidgetController.php @@ -46,7 +46,7 @@ class WidgetController extends AbstractController $response_data = array( 'load' => array(), 'handlers' => array(), - 'dependences' => array(), + 'dependencies' => array(), 'data' => array(), ); @@ -85,7 +85,7 @@ class WidgetController extends AbstractController if ($user_id === false) { // Update local cookie value at target site $response_data['handlers'][] = 'updateUserId'; - $response_data['dependences']['updateUserId'] = array(); + $response_data['dependencies']['updateUserId'] = array(); $response_data['data']['user']['id'] = $visitor['userid']; } @@ -100,7 +100,7 @@ class WidgetController extends AbstractController // Check if invitation is closed if (!$invitation_state['invited'] && !empty($_SESSION['invitation_threadid'])) { $response_data['handlers'][] = 'invitationClose'; - $response_data['dependences']['invitationClose'] = array(); + $response_data['dependencies']['invitationClose'] = array(); unset($_SESSION['invitation_threadid']); } @@ -123,7 +123,7 @@ class WidgetController extends AbstractController // Show invitation dialog at widget side $response_data['handlers'][] = 'invitationCreate'; - $response_data['dependences']['invitationCreate'] = array(); + $response_data['dependencies']['invitationCreate'] = array(); $response_data['data']['invitation'] = array( 'operatorName' => htmlspecialchars($operator_name), 'avatarUrl' => htmlspecialchars($operator['vcavatar']),