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 temp8

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
This commit is contained in:
Shannon
2018-11-20 14:12:26 +11:00
parent b4c2c8bd74 9ae4d1cdf5
commit 96d7cca68d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
View File

@@ -363,11 +363,18 @@ angular.module("umbraco.directives")
//};
var tabShownListener = eventsService.on("valTab.tabShown", function (e, args) {
//the tab has been shown, trigger the mceAutoResize (as it could have timed out before the tab was shown)
if (tinyMceEditor !== undefined && tinyMceEditor != null) {
tinyMceEditor.execCommand('mceAutoResize', false, null, null);
var tabShownListener = eventsService.on("app.tabChange", function (e, args) {
var tabId = args.id;
var myTabId = element.closest(".umb-tab-pane").attr("rel");
if (String(tabId) === myTabId) {
//the tab has been shown, trigger the mceAutoResize (as it could have timed out before the tab was shown)
if (tinyMceEditor !== undefined && tinyMceEditor != null) {
tinyMceEditor.execCommand('mceAutoResize', false, null, null);
}
}
});
//listen for formSubmitting event (the result is callback used to remove the event subscription)

3
src/Umbraco.Web.UI.Client/src/common/directives/validation/valtab.directive.js
View File

@@ -6,7 +6,7 @@
* @description Used to show validation warnings for a tab to indicate that the tab content has validations errors in its data.
* In order for this directive to work, the valFormManager directive must be placed on the containing form.
**/
function valTab(eventsService) {
function valTab() {
return {
require: ['^^form', '^^valFormManager'],
restrict: "A",
@@ -31,7 +31,6 @@ function valTab(eventsService) {
scope.tabHasError = false;
}
});
}
};
}