Skip to content

Commit

Permalink
this closes #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@nadar @slowfox089
nadar authored and slowfox089 committed Dec 10, 2020
1 parent c8f2a1e commit 210dfba
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE

### Fixed

+ [#2](https://github.com/luyadev/luya-module-admin/issues/2) Fixed UX issue with none clickable clock icon.
+ [#356](https://github.com/luyadev/luya-module-admin/issues/356) Hide NgRest attribute groups when no fields are contained.
+ [#361](https://github.com/luyadev/luya-module-admin/issues/361) Disabled tag filter bar when any filter is active.
+ [#343](https://github.com/luyadev/luya-module-admin/pull/343) Fixed bug with migrations when using PostgreSQL.
Expand Down
2 changes: 1 addition & 1 deletion src/resources/dist/main.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/resources/dist/vendor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23459,7 +23459,7 @@ angular.module("ngWig", ["ngwig-app-templates"]), angular.ngWig = {
options: b
});
var c = f[0].getSelection().toString();
"createlink" === a && "" === c ? f[0].execCommand("insertHtml", !1, '<a href="' + b + '" target="_blank">' + b + "</a>") : f[0].execCommand(a, !1, b), h.afterExecCommand({
"createlink" === a && "" === c ? f[0].execCommand("insertHtml", !1, '<a href="' + b + '">' + b + "</a>") : f[0].execCommand(a, !1, b), h.afterExecCommand({
command: a,
options: b
}), i.length && i[0].focus();
Expand Down Expand Up @@ -23558,11 +23558,11 @@ angular.module("ngWig", ["ngwig-app-templates"]), angular.ngWig = {
var d = this;

this.$onInit = function () {
b.replaceWith(c("<" + d.plugin.pluginName + ' plugin="$ctrl.plugin"exec-command="$ctrl.execCommand"edit-mode="$ctrl.editMode"data-disabled="$ctrl.disabled"options="$ctrl.options"content="$ctrl.content"/>')(a));
b.replaceWith(c("<" + d.plugin.pluginName + ' plugin="$ctrl.plugin"exec-command="$ctrl.execCommand"edit-mode="$ctrl.editMode"disabled="$ctrl.disabled"options="$ctrl.options"content="$ctrl.content"/>')(a));
};
}]
}), angular.module("ngwig-app-templates", ["ng-wig/views/ng-wig.html"]), angular.module("ng-wig/views/ng-wig.html", []).run(["$templateCache", function (a) {
a.put("ng-wig/views/ng-wig.html", '<div class="ng-wig">\n <ul class="nw-toolbar">\n <li class="nw-toolbar__item" ng-repeat="button in $ctrl.toolbarButtons">\n <div ng-if="!button.isComplex">\n <button type="button"\n class="nw-button {{button.styleClass}}"\n title="{{button.title}}"\n ng-click="$ctrl.execCommand(button.command)"\n ng-class="{ \'nw-button--active\': !$ctrl.disabled && $ctrl.isEditorActive() && button.isActive() }"\n ng-disabled="$ctrl.editMode || $ctrl.disabled">\n {{ button.title }}\n </button>\n </div>\n <div ng-if="button.isComplex">\n <ng-wig-plugin\n exec-command="$ctrl.execCommand"\n plugin="button"\n edit-mode="$ctrl.editMode"\n data-disabled="$ctrl.disabled"\n options="$ctrl.options"\n content="$ctrl.content"></ng-wig-plugin>\n </div>\n </li><!--\n --><li class="nw-toolbar__item">\n <button type="button"\n class="nw-button nw-button--source"\n title="Edit HTML"\n ng-class="{ \'nw-button--active\': $ctrl.editMode }"\n ng-if="$ctrl.isSourceModeAllowed"\n ng-click="$ctrl.toggleEditMode()"\n ng-disabled="$ctrl.disabled">\n Edit HTML\n </button>\n </li>\n </ul>\n\n <div class="nw-editor-container">\n <div class="nw-editor__src-container" ng-show="$ctrl.editMode">\n <textarea ng-model="$ctrl.content"\n ng-disabled="$ctrl.disabled"\n class="nw-editor__src"></textarea>\n </div>\n <div class="nw-editor" ng-class="{ \'nw-disabled\': $ctrl.disabled }">\n <div id="ng-wig-editable"\n class="nw-editor__res"\n ng-class="{\'nw-invisible\': $ctrl.editMode}"\n ng-disabled="$ctrl.disabled"\n contenteditable\n placeholder="{{$ctrl.placeholder}}">\n </div>\n </div>\n </div>\n</div>\n');
a.put("ng-wig/views/ng-wig.html", '<div class="ng-wig">\n <ul class="nw-toolbar">\n <li class="nw-toolbar__item" ng-repeat="button in $ctrl.toolbarButtons">\n <div ng-if="!button.isComplex">\n <button type="button"\n class="nw-button {{button.styleClass}}"\n title="{{button.title}}"\n ng-click="$ctrl.execCommand(button.command)"\n ng-class="{ \'nw-button--active\': !$ctrl.disabled && $ctrl.isEditorActive() && button.isActive() }"\n ng-disabled="$ctrl.editMode || $ctrl.disabled">\n {{ button.title }}\n </button>\n </div>\n <div ng-if="button.isComplex">\n <ng-wig-plugin\n exec-command="$ctrl.execCommand"\n plugin="button"\n edit-mode="$ctrl.editMode"\n disabled="$ctrl.disabled"\n options="$ctrl.options"\n content="$ctrl.content"></ng-wig-plugin>\n </div>\n </li><!--\n --><li class="nw-toolbar__item">\n <button type="button"\n class="nw-button nw-button--source"\n title="Edit HTML"\n ng-class="{ \'nw-button--active\': $ctrl.editMode }"\n ng-if="$ctrl.isSourceModeAllowed"\n ng-click="$ctrl.toggleEditMode()"\n ng-disabled="$ctrl.disabled">\n Edit HTML\n </button>\n </li>\n </ul>\n\n <div class="nw-editor-container">\n <div class="nw-editor__src-container" ng-show="$ctrl.editMode">\n <textarea ng-model="$ctrl.content"\n ng-disabled="$ctrl.disabled"\n class="nw-editor__src"></textarea>\n </div>\n <div class="nw-editor" ng-class="{ \'nw-disabled\': $ctrl.disabled }">\n <div id="ng-wig-editable"\n class="nw-editor__res"\n ng-class="{\'nw-invisible\': $ctrl.editMode}"\n ng-disabled="$ctrl.disabled"\n contenteditable\n placeholder="{{$ctrl.placeholder}}">\n </div>\n </div>\n </div>\n</div>\n');
}]);function _typeof2(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof2 = function _typeof2(obj) { return typeof obj; }; } else { _typeof2 = function _typeof2(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof2(obj); }

(function webpackUniversalModuleDefinition(root, factory) {
Expand Down
10 changes: 4 additions & 6 deletions src/resources/js/directives.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1797,12 +1797,10 @@ zaa.directive("zaaDatetime", function () {
'</datepicker>' +
'<div ng-show="model!=null && date!=null" class="hour-selection">' +
'<div class="input-group">' +
'<div class="input-group-prepend">' +
'<div class="input-group-text">' +
'<i class="material-icons">access_time</i>' +
'</div>' +
'</div>' +
'<input class="form-control zaa-datetime-hour-input" type="text" ng-model="hour" ng-change="autoRefactor()" />' +
'<div class="input-group-prepend align-items-center">' +
'<i class="material-icons pr-2">access_time</i>' +
'</div>' +
'<input class="form-control zaa-datetime-hour-input" type="text" ng-model="hour" ng-change="autoRefactor()" />' +
'</div>' +
'<div class="input-group">' +
'<div class="input-group-prepend zaa-datetime-time-colon">' +
Expand Down

0 comments on commit 210dfba

Please sign in to comment.