mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix: js action api empty data attribute

Browse Source
This commit is contained in:
buddh4 2017-06-14 11:48:20 +02:00
parent b030bc0ef3
commit 594c14d31e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static/js/humhub/humhub.action.js
View File

@ -218,7 +218,6 @@ humhub.module('action', function(module, require, $) {
Component._buildSelector();
//Binding default action types
this.bindAction(document, 'click', '[data-action-click]');
this.bindAction(document, 'dblclick', '[data-action-dblclick]');
this.bindAction(document, 'change', '[data-action-change]');
}
@ -333,8 +332,8 @@ humhub.module('action', function(module, require, $) {
module.log.debug('Handle Action', this);
var event = this.createActionEvent(options);
if(this.data($trigger, 'confirm') && !options.confirmed) {
if(object.isDefined(this.data($trigger, 'confirm')) && !options.confirmed) {
var that = this;
modal.confirm($trigger).then(function(confirmed) {
if(confirmed) {
@ -444,16 +443,16 @@ humhub.module('action', function(module, require, $) {
* @param {type} $trigger
* @param {type} name
* @param {type} def
* @returns {unresolved}
* @returns {mixed}
*/
ActionBinding.prototype.data = function($trigger, name, def) {
var result = $trigger.data('action-' + this.eventType + '-' + name);
if(!result) {
if(!object.isDefined(result)) {
result = $trigger.data('action-' + name);
}
return result || def;
return object.isDefined(result) ? result : def;
};
ActionBinding.prototype.getUrl = function($trigger) {