mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Remove deprecated hotkeyMac attribute

Browse Source
This commit is contained in:
Pásztor Gábor 2016-01-09 17:07:23 +01:00
parent 373c31a8e7
commit fd264a5fb4
8 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/system/assets/ui/js/input.hotkey.js
View File

@ -50,9 +50,6 @@
}
HotKey.prototype.init = function() {
if (this.options.hotkeyMac)
this.options.hotkey += ', ' + this.options.hotkeyMac // @todo deprecated
this.initKeyMap()
var keys = this.options.hotkey.toLowerCase().split(',')
@ -175,7 +172,6 @@
HotKey.DEFAULTS = {
hotkey: null,
hotkeyMac: null, // @todo deprecated
hotkeyTarget: 'html',
hotkeyVisible: true,
callback: function(element) {

2
modules/system/assets/ui/js/inspector.editor.dictionary.js
View File

@ -115,7 +115,7 @@
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'
}

2
modules/system/assets/ui/js/inspector.editor.object.js
View File

@ -114,7 +114,7 @@
}
ObjectEditor.prototype.validate = function(silentMode) {
var values = values = this.childInspector.getValues()
var values = this.childInspector.getValues()
if (this.cleanUpValue(values) === $.oc.inspector.removedProperty) {
// Ignore any validation rules if the object's required

2
modules/system/assets/ui/js/inspector.editor.objectlist.js
View File

@ -172,7 +172,7 @@
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'
}

2
modules/system/assets/ui/js/inspector.editor.popupbase.js
View File

@ -49,7 +49,7 @@
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'
}

2
modules/system/assets/ui/js/inspector.editor.text.js
View File

@ -52,7 +52,7 @@
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'
}

6
modules/system/assets/ui/js/inspector.surface.js
View File

@ -190,8 +190,7 @@
var row = this.buildRow(property, currentGroup)
if (property.itemType == 'group')
{
if (property.itemType == 'group') {
this.applyGroupLevelToRow(row, currentGroup.parentGroup)
}
else {
@ -412,7 +411,8 @@
if ($.oc.foundation.element.hasClass(link, 'expanded') && !forceExpand) {
$.oc.foundation.element.removeClass(link, 'expanded')
} else {
}
else {
$.oc.foundation.element.addClass(link, 'expanded')
collapse = false
}

22
modules/system/assets/ui/storm-min.js vendored
View File

@ -2784,9 +2784,7 @@ this.keyConditions=null
this.keyMap=null
this.options=null
BaseProto.dispose.call(this)}
HotKey.prototype.init=function(){if(this.options.hotkeyMac)
this.options.hotkey+=', '+this.options.hotkeyMac
this.initKeyMap()
HotKey.prototype.init=function(){this.initKeyMap()
var keys=this.options.hotkey.toLowerCase().split(',')
for(var i=0,len=keys.length;i<len;i++){var keysTrimmed=this.trim(keys[i])
this.keyConditions.push(this.makeCondition(keysTrimmed))}
@ -2816,7 +2814,7 @@ HotKey.prototype.onKeyDown=function(ev){if(this.testConditions(ev)){if(this.opti
return
if(this.options.callback)
return this.options.callback(this.$el,ev.currentTarget)}}
HotKey.DEFAULTS={hotkey:null,hotkeyMac:null,hotkeyTarget:'html',hotkeyVisible:true,callback:function(element){element.trigger('click')
HotKey.DEFAULTS={hotkey:null,hotkeyTarget:'html',hotkeyVisible:true,callback:function(element){element.trigger('click')
return false}}
var old=$.fn.hotKey
$.fn.hotKey=function(option){var args=arguments;return this.each(function(){var $this=$(this)
@ -3403,8 +3401,7 @@ for(var i=0,len=this.parsedProperties.properties.length;i<len;i++){var property=
if(property.itemType=='group'){currentGroup=this.getGroupManager().createGroup(property.groupIndex,this.group)}
else{if(property.groupIndex===undefined){currentGroup=this.group}}
var row=this.buildRow(property,currentGroup)
if(property.itemType=='group')
{this.applyGroupLevelToRow(row,currentGroup.parentGroup)}
if(property.itemType=='group'){this.applyGroupLevelToRow(row,currentGroup.parentGroup)}
else{this.applyGroupLevelToRow(row,currentGroup)}
tbody.appendChild(row)
this.buildEditor(row,property,dataTable,currentGroup)}
@ -3474,7 +3471,8 @@ var groupLevel=group.getLevel()
row.setAttribute('data-group-level',groupLevel)
th.children[0].style.marginLeft=groupLevel*10+'px'}
Surface.prototype.toggleGroup=function(row,forceExpand){var link=row.querySelector('a'),groupIndex=row.getAttribute('data-group-index'),table=this.getRootTable(),groupManager=this.getGroupManager(),collapse=true
if($.oc.foundation.element.hasClass(link,'expanded')&&!forceExpand){$.oc.foundation.element.removeClass(link,'expanded')}else{$.oc.foundation.element.addClass(link,'expanded')
if($.oc.foundation.element.hasClass(link,'expanded')&&!forceExpand){$.oc.foundation.element.removeClass(link,'expanded')}
else{$.oc.foundation.element.addClass(link,'expanded')
collapse=false}
var propertyRows=groupManager.findGroupRows(table,groupIndex,!collapse),duration=Math.round(50/propertyRows.length)
this.expandOrCollapseRows(propertyRows,collapse,duration,forceExpand)
@ -4324,7 +4322,7 @@ PopupBase.prototype.getPopupContent=function(){return'<form>
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'}
PopupBase.prototype.updateDisplayedValue=function(value){this.setLinkText(this.getLink(),value)}
@ -4382,7 +4380,7 @@ TextEditor.prototype.getPopupContent=function(){return'<form>
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'}
TextEditor.prototype.configureComment=function(popup){if(!this.propertyDefinition.description){return}
@ -4589,7 +4587,7 @@ ObjectListEditor.prototype.getPopupContent=function(){return'<form>
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'}
ObjectListEditor.prototype.buildPopupContents=function(popup){this.buildItemsTable(popup)}
@ -4773,7 +4771,7 @@ ObjectEditor.prototype.getUndefinedValue=function(){var result={}
for(var i=0,len=this.propertyDefinition.properties.length;i<len;i++){var propertyName=this.propertyDefinition.properties[i].property,editor=this.childInspector.findPropertyEditor(propertyName)
if(editor){result[propertyName]=editor.getUndefinedValue()}}
return this.getValueOrRemove(result)}
ObjectEditor.prototype.validate=function(silentMode){var values=values=this.childInspector.getValues()
ObjectEditor.prototype.validate=function(silentMode){var values=this.childInspector.getValues()
if(this.cleanUpValue(values)===$.oc.inspector.removedProperty){return true}
return this.childInspector.validate(silentMode)}
ObjectEditor.prototype.onInspectorDataChange=function(property,value){var values=this.childInspector.getValues()
@ -4872,7 +4870,7 @@ DictionaryEditor.prototype.getPopupContent=function(){return'<form>
</div> \
<div class="modal-footer"> \
<button type="submit" class="btn btn-primary">OK</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">Cancel</button> \
</div> \
</form>'}
DictionaryEditor.prototype.configurePopup=function(popup){this.buildItemsTable(popup.get(0))