yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7747

Browse Source 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
This commit is contained in:
Shannon
2016-01-20 13:38:17 +01:00
parent 85207b3d5c c16aa5bbf0
commit 4e1e240f54
11 changed files with 242 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbbutton.directive.js
View File

@@ -50,6 +50,7 @@
buttonStyle: "@?",
state: "=?",
shortcut: "@?",
shortcutWhenHidden: "@",
label: "@?",
labelKey: "@?",
icon: "@?",

90
src/Umbraco.Web.UI.Client/src/common/directives/components/forms/hotkey.directive.js
View File

@@ -1,55 +1,59 @@
/**
* @ngdoc directive
* @name umbraco.directives.directive:headline
**/
* @ngdoc directive
* @name umbraco.directives.directive:headline
**/
angular.module("umbraco.directives")
.directive('hotkey', function ($window, keyboardService, $log) {
.directive('hotkey', function($window, keyboardService, $log) {
return function (scope, el, attrs) {
return function(scope, el, attrs) {
var options = {};
var keyCombo = attrs.hotkey;
var options = {};
var keyCombo = attrs.hotkey;
if (!keyCombo) {
//support data binding
keyCombo = scope.$eval(attrs["hotkey"]);
}
if (!keyCombo) {
//support data binding
keyCombo = scope.$eval(attrs["hotkey"]);
}
// disable shortcuts in input fields if keycombo is 1 character
if(keyCombo) {
// disable shortcuts in input fields if keycombo is 1 character
if (keyCombo) {
if(keyCombo.length === 1) {
options = {
inputDisabled: true
};
}
keyboardService.bind(keyCombo, function(){
var element = $(el);
var activeElementType = document.activeElement.tagName;
var clickableElements = ["A", "BUTTON"];
if(element.is("a,div,button,input[type='button'],input[type='submit'],input[type='checkbox']") && !element.is(':disabled') ){
// when keycombo is enter and a link or button has focus - click the link or button instead of using the hotkey
if(keyCombo === "enter" && clickableElements.indexOf(activeElementType) === 0) {
document.activeElement.click();
} else {
element.click();
}
}else{
element.focus();
if (keyCombo.length === 1) {
options = {
inputDisabled: true
};
}
}, options);
keyboardService.bind(keyCombo, function() {
el.on('$destroy', function(){
keyboardService.unbind(keyCombo);
});
var element = $(el);
var activeElementType = document.activeElement.tagName;
var clickableElements = ["A", "BUTTON"];
}
if (element.is("a,div,button,input[type='button'],input[type='submit'],input[type='checkbox']") && !element.is(':disabled')) {
};
});
if (element.is(':visible') || attrs.hotkeyWhenHidden) {
// when keycombo is enter and a link or button has focus - click the link or button instead of using the hotkey
if (keyCombo === "enter" && clickableElements.indexOf(activeElementType) === 0) {
document.activeElement.click();
} else {
element.click();
}
}
} else {
element.focus();
}
}, options);
el.on('$destroy', function() {
keyboardService.unbind(keyCombo);
});
}
};
});

12
src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js
View File

@@ -132,7 +132,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
letter: ch,
labelKey: "buttons_saveAndPublish",
handler: args.methods.saveAndPublish,
hotKey: "ctrl+p"
hotKey: "ctrl+p",
hotKeyWhenHidden: true
};
case "H":
//send to publish
@@ -140,7 +141,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
letter: ch,
labelKey: "buttons_saveToPublish",
handler: args.methods.sendToPublish,
hotKey: "ctrl+p"
hotKey: "ctrl+p",
hotKeyWhenHidden: true
};
case "A":
//save
@@ -148,7 +150,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
letter: ch,
labelKey: "buttons_save",
handler: args.methods.save,
hotKey: "ctrl+s"
hotKey: "ctrl+s",
hotKeyWhenHidden: true
};
case "Z":
//unpublish
@@ -156,7 +159,8 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
letter: ch,
labelKey: "content_unPublish",
handler: args.methods.unPublish,
hotKey: "ctrl+u"
hotKey: "ctrl+u",
hotKeyWhenHidden: true
};
default:
return null;

39
src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js
View File

@@ -10,7 +10,7 @@ angular.module('umbraco.services')
'target': $window.document,
'keyCode': false
};
var isMac = navigator.platform.toUpperCase().indexOf('MAC')>=0;
// Store all keyboard combination shortcuts
@@ -25,19 +25,16 @@ angular.module('umbraco.services')
label = label.replace("ctrl","meta");
}
//always try to unbind first, so we dont have multiple actions on the same key
keyboardManagerService.unbind(label);
var fct, elt, code, k;
// Initialize opt object
opt = angular.extend({}, defaultOpt, opt);
label = label.toLowerCase();
elt = opt.target;
if(typeof opt.target === 'string'){
elt = document.getElementById(opt.target);
}
elt = document.getElementById(opt.target);
}
fct = function (e) {
e = e || $window.event;
@@ -45,21 +42,21 @@ angular.module('umbraco.services')
if (opt['inputDisabled']) {
var elt;
if (e.target){
elt = e.target;
elt = e.target;
}else if (e.srcElement){
elt = e.srcElement;
}
elt = e.srcElement;
}
if (elt.nodeType === 3){elt = elt.parentNode;}
if (elt.nodeType === 3){elt = elt.parentNode;}
if (elt.tagName === 'INPUT' || elt.tagName === 'TEXTAREA'){return;}
}
// Find out which key is pressed
if (e.keyCode){
code = e.keyCode;
code = e.keyCode;
}else if (e.which){
code = e.which;
}
code = e.which;
}
var character = String.fromCharCode(code).toLowerCase();
@@ -95,7 +92,7 @@ angular.module('umbraco.services')
var special_keys = {
'esc':27,
'escape':27,
'tab':9,
'tab':9,
'space':32,
'return':13,
'enter':13,
@@ -148,11 +145,11 @@ angular.module('umbraco.services')
// Some modifiers key
var modifiers = {
shift: {
wanted: false,
wanted: false,
pressed: e.shiftKey ? true : false
},
ctrl : {
wanted: false,
wanted: false,
pressed: e.ctrlKey ? true : false
},
alt : {
@@ -160,7 +157,7 @@ angular.module('umbraco.services')
pressed: e.altKey ? true : false
},
meta : { //Meta is Mac specific
wanted: false,
wanted: false,
pressed: e.metaKey ? true : false
}
};
@@ -252,13 +249,13 @@ angular.module('umbraco.services')
label = label.toLowerCase();
var binding = keyboardManagerService.keyboardEvent[label];
delete(keyboardManagerService.keyboardEvent[label]);
if(!binding){return;}
var type = binding['event'],
elt = binding['target'],
callback = binding['callback'];
if(elt.detachEvent){
elt.detachEvent('on' + type, callback);
}else if(elt.removeEventListener){
@@ -270,4 +267,4 @@ angular.module('umbraco.services')
//
return keyboardManagerService;
}]);
}]);

5
src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button-group.html
View File

@@ -7,7 +7,8 @@
state="state"
label="{{defaultButton.labelKey}}"
label-key="{{defaultButton.labelKey}}"
shortcut="{{defaultButton.hotKey}}">
shortcut="{{defaultButton.hotKey}}"
shortcut-when-hidden="{{defaultButton.hotKeyWhenHidden}}">
</umb-button>
<a class="btn btn-success dropdown-toggle umb-button-group__toggle" data-toggle="dropdown" ng-if="subButtons.length > 0">
@@ -16,7 +17,7 @@
<ul aria-labelledby="dLabel" class="dropdown-menu bottom-up umb-button-group__sub-buttons" ng-if="subButtons.length > 0" role="menu" ng-class="{'-align-right': float === 'right'}">
<li ng-repeat="subButton in subButtons">
<a href="#" ng-click="subButton.handler()" hotkey="{{subButton.hotKey}}" prevent-default>
<a href="#" ng-click="subButton.handler()" hotkey="{{subButton.hotKey}}" hotkey-when-hidden="{{subButton.hotKeyWhenHidden}}" prevent-default>
<localize key="{{subButton.labelKey}}">{{subButton.labelKey}}</localize>
</a>
</li>

6
src/Umbraco.Web.UI.Client/src/views/components/buttons/umb-button.html
View File

@@ -8,7 +8,7 @@
<div ng-if="state !== 'init'" class="umb-button__overlay"></div>
<a ng-if="type === 'link'" href="{{href}}" class="btn umb-button__button {{style}}" hotkey="{{shortcut}}">
<a ng-if="type === 'link'" href="{{href}}" class="btn umb-button__button {{style}}" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}">
<span class="umb-button__content" ng-class="{'-hidden': state !== 'init'}">
<i ng-if="icon && buttonStyle==='link'" class="{{icon}} umb-button__icon"></i>
<localize ng-if="labelKey" key="{{labelKey}}">{{label}}</localize>
@@ -16,7 +16,7 @@
</span>
</a>
<button ng-if="type === 'button'" type="button" class="btn umb-button__button {{style}}" ng-click="action(model)" hotkey="{{shortcut}}" ng-disabled="disabled">
<button ng-if="type === 'button'" type="button" class="btn umb-button__button {{style}}" ng-click="action(model)" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}" ng-disabled="disabled">
<span class="umb-button__content" ng-class="{'-hidden': state !== 'init'}">
<i ng-if="icon && buttonStyle==='link'" class="{{icon}} umb-button__icon"></i>
<localize ng-if="labelKey" key="{{labelKey}}">{{label}}</localize>
@@ -24,7 +24,7 @@
</span>
</button>
<button ng-if="type === 'submit'" type="submit" class="btn umb-button__button {{style}}" hotkey="{{shortcut}}" ng-disabled="disabled">
<button ng-if="type === 'submit'" type="submit" class="btn umb-button__button {{style}}" hotkey="{{shortcut}}" hotkey-when-hidden="{{shortcutWhenHidden}}" ng-disabled="disabled">
<span class="umb-button__content" ng-class="{'-hidden': state !== 'init'}">
<i ng-if="icon && buttonStyle==='link'" class="{{icon}} umb-button__icon"></i>
<localize ng-if="labelKey" key="{{labelKey}}">{{label}}</localize>

2
src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
View File

@@ -46,6 +46,8 @@
}
];
hotKeyWhenHidden: true,
hotKeyWhenHidden: true,
vm.page.keyboardShortcutsOverview = [
{
"name": localizationService.localize("main_sections"),