Merge branch 'develop' of github.com:octobercms/october into develop
This commit is contained in:
commit
f3ab4595b2
|
|
@ -286,10 +286,11 @@
|
|||
|
||||
var $editorLink = $('a', $editor)
|
||||
|
||||
$editorLink.click(function() {
|
||||
return self.toggleExternalParameterEditor($(this))
|
||||
})
|
||||
.attr('title', 'Click to enter the external parameter name to load the property value from')
|
||||
$editorLink
|
||||
.click(function() {
|
||||
return self.toggleExternalParameterEditor($(this))
|
||||
})
|
||||
.attr('title', 'Click to enter a partial variable or URL parameter to load the property value from')
|
||||
.tooltip({'container': 'body', delay: 500})
|
||||
|
||||
var $input = $editor.find('input'),
|
||||
|
|
@ -331,8 +332,9 @@
|
|||
'left': position.left + 'px',
|
||||
'right': 0
|
||||
})
|
||||
} else
|
||||
} else {
|
||||
$editor.css('right', 0)
|
||||
}
|
||||
|
||||
setTimeout(function(){
|
||||
$editor.css('left', 0)
|
||||
|
|
@ -367,7 +369,7 @@
|
|||
$container.removeClass('editor-visible')
|
||||
$container.closest('td').removeClass('active')
|
||||
}, 200)
|
||||
$editorLink.attr('data-original-title', 'Click to enter the external parameter name to load the property value from')
|
||||
$editorLink.attr('data-original-title', 'Click to enter a partial variable or URL parameter to load the property value from')
|
||||
$editor.find('input').attr('tabindex', -1)
|
||||
self.toggleCellEditorVisibility($cell, true)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue