Skip to content

Commit

Permalink
fix relese problem (#713)
Browse files Browse the repository at this point in the history
* fix relese problem

* fix comment
  • Loading branch information
s-andrey authored Apr 3, 2020
1 parent 1dc2034 commit 677e71b
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@
All notable changes to this project will be documented in this file.

## [Unreleased]

## [0.14.1]
### Changed
* Change use template caption, when create new project.
* Swap diagrams and model position in main menu.

### Fixed
* Fix work hotkey in inputs on diagrams primitives.
* FIx save class.

## [0.14.0]
### Added
* Add stage export.
Expand Down
1 change: 1 addition & 0 deletions addon/controllers/fd-application-model.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ export default Controller.extend(FdSheetCloseConfirm, FdReadonlyProjectMixin, Fd
stereotype: stereotype
});

newClass.incrementProperty('referenceCount');
if (!isBlank(dataobject) && !(dataobject instanceof $.Event)) {
let formView = store.createRecord('fd-dev-form-view', {
view: null,
Expand Down
6 changes: 5 additions & 1 deletion addon/mixins/fd-uml-diagram-component/fd-keypress-logic.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ export default Mixin.create({
@param {Event} e event.
*/
_keydownHandler(e) {
if ($(e.target).is('textarea,input')) {
return;
}

if (e.ctrlKey) {
e.stopPropagation();

Expand Down Expand Up @@ -116,7 +120,7 @@ export default Mixin.create({

this.get('paper').$el.focus();

} else if (e.keyCode === 46 && !$(e.target).is('textarea,input')) {
} else if (e.keyCode === 46) {
e.stopPropagation();
e.preventDefault();
this.deleteSelectElements();
Expand Down
5 changes: 5 additions & 0 deletions addon/services/fd-lock-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,11 @@ export default Service.extend({
return JSON.parse(result.value);
});
}

// Delete this when add lock for view git #709
if (objectTypeName === 'view-sheet') {
return resolve(true);
}
}

return resolve(false);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-flexberry-designer",
"version": "0.14.0",
"version": "0.14.1",
"description": "CASE addon for ember-flexberry applications",
"keywords": [
"ember-addon",
Expand Down

0 comments on commit 677e71b

Please sign in to comment.