amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-02-22 18:06:24 +00:00
Code Issues Projects Releases Wiki Activity

(js) Drop sgTransformOnBlur directive

Browse Source 
The md-chips component has now a functional "md-add-on-blur" functionality.

Fixes #3944
This commit is contained in:
Francis Lachapelle
2017-03-22 15:35:05 -04:00
parent 75aaef0f3d
commit b463fd4eda
3 changed files with 4 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
UI/Templates/MailerUI/UIxMailEditor.wox
View File

@@ -69,7 +69,7 @@
<md-chips ng-model="editor.message.editable.to"
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'to')"
sg-transform-on-blur="sg-transform-on-blur">
md-add-on-blur="true">
<md-autocomplete
class="sg-chips-autocomplete"
md-autofocus="true"
@@ -103,7 +103,7 @@
<md-chips ng-model="editor.message.editable.cc"
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'cc')"
sg-transform-on-blur="sg-transform-on-blur">
md-add-on-blur="true">
<md-autocomplete
class="sg-chips-autocomplete"
md-search-text="editor.autocomplete.cc.searchText"
@@ -136,7 +136,7 @@
<md-chips ng-model="editor.message.editable.bcc"
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'bcc')"
sg-transform-on-blur="sg-transform-on-blur">
md-add-on-blur="true">
<md-autocomplete
class="sg-chips-autocomplete"
md-selected-item="editor.autocomplete.bcc.selected"

2
UI/Templates/MailerUI/UIxMailMainFrame.wox
View File

@@ -254,7 +254,7 @@
ng-show="app.search.params.length != 0 || app.currentSearchParam"
ng-model="app.search.params"
md-transform-chip="app.newSearchParam($chip)"
sg-transform-on-blur="sg-transform-on-blur">
md-add-on-blur="true">
<input sg-focus-on="advancedSearch" type="text"
ng-disabled="app.currentSearchParam.length == 0"
sg-placeholder="app.search.options[app.currentSearchParam]"/>

84
UI/WebServerResources/js/Common/sgTransformOnBlur.directive.js
View File

@@ -1,84 +0,0 @@
/* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
(function() {
/* jshint loopfunc: true */
'use strict';
/**
* sgTransformOnBlur - A directive to extend md-chips so the text of the input
* field is converted to a chip when the field is loosing focus.
*
* See issues on github:
*
* https://github.com/angular/material/issues/3364 (md-add-on-blur)
* https://github.com/angular/material/issues/9582
*
* Code is extracted from "MdChipsCtrl.prototype.onInputBlur" in controller:
*
* angular-material/src/components/chips/js/chipsController.js
*
* @memberof SOGo.Common
* @ngInject
* @example:
<md-chips ng-model="editor.message.editable.to"
md-separator-keys="editor.recipientSeparatorKeys"
md-transform-chip="editor.addRecipient($chip, 'to')"
sg-transform-on-blur>
*/
sgTransformOnBlur.$inject = ['$window', '$timeout'];
function sgTransformOnBlur($window, $timeout) {
return {
link: link,
require: 'mdChips', // Extends the original mdChips directive
restrict: 'A'
};
function link(scope, element, attributes, mdChipsCtrl) {
var mouseUpActions = [];
mdChipsCtrl.onInputBlur = function() {
var appendFcn;
this.inputHasFocus = false;
appendFcn = (function() {
var chipBuffer = this.getChipBuffer().trim();
// Update the custom chip validators.
this.validateModel();
var isModelValid = this.ngModelCtrl.$valid;
if (this.userInputNgModelCtrl) {
isModelValid &= this.userInputNgModelCtrl.$valid;
}
// Only append the chip and reset the chip buffer if the chips and input ngModel is valid.
if (chipBuffer && isModelValid) {
this.appendChip(chipBuffer);
this.resetChipBuffer();
}
}).bind(this);
if (this.autocompleteCtrl) {
mouseUpActions.push(appendFcn);
$window.addEventListener('click', function(event){
while (mouseUpActions.length > 0) {
// Trigger actions after some delay to give time to md-autocomple to clear the input field
var action = mouseUpActions.splice(0,1)[0];
$timeout(function(){
$timeout(action);
});
}
}, false);
}
else
appendFcn();
};
}
}
angular
.module('SOGo.Common')
.directive('sgTransformOnBlur', sgTransformOnBlur);
})();