[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-696] CHANNELMGR-696: move some tests
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-696 at cms-community
/ hippo-addon-channel-manager
Commits:
7845ac63 by Mark at 2016-05-30T14:29:29+02:00
CHANNELMGR-696: move some tests
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/channel.controller.spec.js
- frontend-ng/src/angularjs/channel/channel.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/channel.controller.spec.js
=
--- a/frontend-ng/src/angularjs/channel/channel.controller.spec.js
+++ b/frontend-ng/src/angularjs/channel/channel.controller.spec.js
@@ -53,6 +53,10 @@ describe('ChannelCtrl', () => {
'discardChanges',
'getCatalog',
'getSiteMapId',
+'getEditMode',
+'enterEditMode',
+'leaveEditMode',
+'isEditModeActive',
]);
ChannelService.createPreviewConfiguration.and.returnValue(resolvedPromise);
@@ -122,19 +126,6 @@ describe('ChannelCtrl', () => {
expect(ChannelCtrl.getRenderVariant()).toBe('variant1');
});
- it('is not in edit mode by default', () => {
-expect(ChannelCtrl.isEditModeActive()).toEqual(false);
- });
-
- it('enables and disables edit mode when toggling it', () => {
-ChannelService.hasPreviewConfiguration.and.returnValue(true);
-
-ChannelCtrl.enterEditMode();
-expect(ChannelCtrl.isEditModeActive()).toEqual(true);
-ChannelCtrl.leaveEditMode();
-expect(ChannelCtrl.isEditModeActive()).toEqual(false);
- });
-
it('creates preview configuration when it has not been created yet before
enabling edit mode', () => {
const deferCreatePreview = $q.defer();
const deferReload = $q.defer();
@@ -225,6 +216,6 @@ describe('ChannelCtrl', () => {
ChannelCtrl.editMenu('testUuid');
expect(ChannelCtrl.menuUuid).toBe('testUuid');
-expect(ChannelCtrl.currentSubpage).toBe('menu-editor');
+expect(ChannelCtrl.subpage.current).toBe('menu-editor');
});
});
=
frontend-ng/src/angularjs/channel/channel.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/channel.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/channel.service.spec.js
@@ -611,4 +611,17 @@ describe('ChannelService', () => {
$rootScope.$digest();
expect(ChannelService.getContentRootPath()).toEqual('/content/documents/testChannel');
});
+
+ it('is not in edit mode by default', () => {
+expect(ChannelService.isEditModeActive()).toEqual(false);
+ });
+
+ it('enables and disables edit mode when toggling it', () => {
+spyOn(ChannelService, 'hasPreviewConfiguration').and.returnValue(true);
+
+ChannelService.enterEditMode();
+expect(ChannelService.isEditModeActive()).toEqual(true);
+ChannelService.leaveEditMode();
+expect(ChannelService.isEditModeActive()).toEqual(false);
+ });
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7845ac637fe7809f815d3a716a82c464a2d768e6
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-696
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-696 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-696] 2 commits: CHANNELMGR-696: add tests
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-696 at cms-community
/ hippo-addon-channel-manager
Commits:
4d6acc28 by Mark at 2016-05-30T16:35:44+02:00
CHANNELMGR-696: add tests
- - - - -
6000903d by Mark at 2016-05-30T16:43:22+02:00
CHANNELMGR-696: add test
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/sidenav/sidenav.spec.js
- + frontend-ng/src/angularjs/channel/subpage/subpage.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidenav/sidenav.spec.js
=
--- a/frontend-ng/src/angularjs/channel/sidenav/sidenav.spec.js
+++ b/frontend-ng/src/angularjs/channel/sidenav/sidenav.spec.js
@@ -23,6 +23,7 @@ describe('ChannelSidenav', () => {
let SiteMapService;
let ChannelService;
let HippoIframeService;
+ let SubpageService;
let parentScope;
const catalogComponents = [
{ label: 'dummy' },
@@ -31,13 +32,14 @@ describe('ChannelSidenav', () => {
beforeEach(() => {
module('hippo-cm');
-inject((_$rootScope_, _$compile_, _ChannelSidenavService_,
_ChannelService_, _SiteMapService_, _HippoIframeService_) => {
+inject((_$rootScope_, _$compile_, _ChannelSidenavService_,
_ChannelService_, _SiteMapService_, _HippoIframeService_, _SubpageService_) => {
$rootScope = _$rootScope_;
$compile = _$compile_;
ChannelSidenavService = _ChannelSidenavService_;
ChannelService = _ChannelService_;
SiteMapService = _SiteMapService_;
HippoIframeService = _HippoIframeService_;
+ SubpageService = _SubpageService_;
});
spyOn(ChannelService, 'getCatalog').and.returnValue([]);
@@ -46,6 +48,7 @@ describe('ChannelSidenav', () => {
spyOn(SiteMapService, 'get');
spyOn(HippoIframeService, 'load');
spyOn(HippoIframeService, 'getCurrentRenderPathInfo');
+spyOn(SubpageService, 'showSubpage');
});
function instantiateController(editMode) {
@@ -117,5 +120,11 @@ describe('ChannelSidenav', () => {
siteMapItem.renderPathInfo = '/other/path';
expect(ChannelSidenavCtrl.isActiveSiteMapItem(siteMapItem)).toBe(false);
});
+
+ it('can show a subpage', () => {
+const ChannelSidenavCtrl = instantiateController(false);
+ChannelSidenavCtrl.showSubpage('test');
+expect(SubpageService.showSubpage).toHaveBeenCalledWith('test');
+ });
});
=
frontend-ng/src/angularjs/channel/subpage/subpage.service.spec.js
=
--- /dev/null
+++ b/frontend-ng/src/angularjs/channel/subpage/subpage.service.spec.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Hippo B.V. (http://www.onehippo.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* eslint-disable prefer-const */
+
+describe('SubpageService', () => {
+ 'use strict';
+
+ let SubpageService;
+
+ beforeEach(() => {
+module('hippo-cm');
+
+inject((_SubpageService_) => {
+ SubpageService = _SubpageService_;
+});
+
+SubpageService.subpage = {
+ current: 'test',
+};
+ });
+
+ describe('getSubpage', () => {
+beforeEach(() => {
+ spyOn(SubpageService, 'getSubpage').and.callThrough();
+});
+it('should return this.subpage', () => {
+ expect(SubpageService.getSubpage().current).toBe('test');
+});
+ });
+
+ describe('showSubpage', () => {
+it('should show a subpage', () => {
+ SubpageService.showSubpage('new-subpage');
+ expect(SubpageService.subpage.current).toBe('new-subpage');
+});
+ });
+
+ describe('hideSubpage', () => {
+it('should hide a subpage', () => {
+ expect(SubpageService.subpage.current).toBe('test');
+ SubpageService.hideSubpage();
+ expect(SubpageService.subpage.current).toBe(undefined);
+});
+ });
+});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/885a7a3f7e0d390aaec4c9353deab729c188b16b...6000903ddba5e1c7fb457cbf4f1204b61ca03669
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-699] CHANNELMGR-699: tests for hasLocalParameters
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-699 at cms-community
/ hippo-addon-channel-manager
Commits:
a5cabf32 by Mark at 2016-05-30T17:04:41+02:00
CHANNELMGR-699: tests for hasLocalParameters
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/menu/editor.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.spec.js
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.spec.js
+++ b/frontend-ng/src/angularjs/channel/menu/editor.spec.js
@@ -74,5 +74,27 @@ describe('MenuEditor', () => {
$element.find('.qa-button-back').click();
expect($scope.onDone).toHaveBeenCalled();
});
-});
+ describe('MenuEditorCtrl', () => {
+describe('hasLocalParameters', () => {
+ it('returns false if there are not local parameters', () => {
+const MenuEditorCtrl = compileDirectiveAndGetController();
+MenuEditorCtrl.editingItem = {
+ id: 1,
+ localParameters: {},
+};
+expect(MenuEditorCtrl.hasLocalParameters()).toBe(false);
+ });
+ it('returns true if there are local parameters', () => {
+const MenuEditorCtrl = compileDirectiveAndGetController();
+MenuEditorCtrl.editingItem = {
+ id: 1,
+ localParameters: {
+test: 1,
+ },
+};
+expect(MenuEditorCtrl.hasLocalParameters()).toBe(true);
+ });
+});
+ });
+});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a5cabf32b7e7c36eb90c72923bc31dab9d23aaac
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-699] CHANNELMGR-699: add more tes
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-699 at cms-community
/ hippo-addon-channel-manager
Commits:
174e26e3 by Mark at 2016-05-30T18:09:37+02:00
CHANNELMGR-699: add more tes
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/menu/editor.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.spec.js
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.spec.js
+++ b/frontend-ng/src/angularjs/channel/menu/editor.spec.js
@@ -28,13 +28,14 @@ describe('MenuEditor', () => {
let DialogService;
let FeedbackService;
let HippoIframeService;
+ let FormStateService;
let menu;
let MenuEditorCtrl;
beforeEach(() => {
module('hippo-cm');
-inject((_$q_, _$rootScope_, _$compile_, _SiteMenuService_,
_DialogService_, _FeedbackService_, _HippoIframeService_) => {
+inject((_$q_, _$rootScope_, _$compile_, _SiteMenuService_,
_DialogService_, _FeedbackService_, _HippoIframeService_, _FormStateService_)
=> {
$q = _$q_;
$rootScope = _$rootScope_;
$compile = _$compile_;
@@ -42,6 +43,7 @@ describe('MenuEditor', () => {
DialogService = _DialogService_;
FeedbackService = _FeedbackService_;
HippoIframeService = _HippoIframeService_;
+ FormStateService = _FormStateService_;
});
menu = { items: [] };
@@ -82,7 +84,7 @@ describe('MenuEditor', () => {
expect($scope.onDone).toHaveBeenCalled();
});
- fdescribe('MenuEditorCtrl', () => {
+ describe('MenuEditorCtrl', () => {
beforeEach(() => {
MenuEditorCtrl = compileDirectiveAndGetController();
MenuEditorCtrl.editingItem = {
@@ -111,6 +113,60 @@ describe('MenuEditor', () => {
});
});
+describe('addItem', () => {
+ it('should add an item', () => {
+spyOn(SiteMenuService, 'getMenu').and.callFake(() => {
+ const deferred = $q.defer();
+ deferred.resolve();
+ return deferred.promise;
+});
+spyOn(SiteMenuService, 'createEditableMenuItem').and.callFake(() => {
+ const deferred = $q.defer();
+ deferred.resolve({
+id: 15,
+ });
+ return deferred.promise;
+});
+spyOn(FormStateService, 'setValid');
+spyOn(MenuEditorCtrl, '_startEditingItem');
+
+MenuEditorCtrl.menuUuid = 33;
+MenuEditorCtrl.editingItem = {
+ id: 12,
+};
+MenuEditorCtrl.addItem();
+expect(SiteMenuService.getMenu).toHaveBeenCalledWith(33);
+$rootScope.$apply();
+expect(SiteMenuService.createEditableMenuItem).toHaveBeenCalled();
+$rootScope.$apply();
+expect(FormStateService.setValid).toHaveBeenCalledWith(true);
+expect(MenuEditorCtrl.isSaving.newItem).toBe(false);
+expect(MenuEditorCtrl._startEditingItem).toHaveBeenCalledWith({
+ id: 15,
+});
+ });
+ it('should fail when adding an item', () => {
+spyOn(SiteMenuService, 'getMenu').and.callFake(() => {
+ const deferred = $q.defer();
+ deferred.reject({
+data: 'bad!',
+ });
+ return deferred.promise;
+});
+spyOn(MenuEditorCtrl, 'onError');
+
+MenuEditorCtrl.menuUuid = 77;
+
+MenuEditorCtrl.addItem();
+expect(SiteMenuService.getMenu).toHaveBeenCalledWith(77);
+$rootScope.$apply();
+expect(MenuEditorCtrl.onError).toHaveBeenCalledWith({
+ key: 'ERROR_MENU_CREATE_FAILED',
+ params: 'bad!',
+});
+ });
+});
+
describe('toggleEditState', () => {
it('calls the appropriate function after checking if an item is already
being edited', () => {
spyOn(SiteMenuService, 'getEditableMenuItem').and.callFake(() => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/174e26e3f6743206875c46c9d8b628126ac30bbc
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1] CHANNELMGR-638: remove unneeded div
Mark Lenser pushed to branch feature/cmng-psp1 at cms-community / hippo-addon-channel-manager Commits: 7145a761 by Mark at 2016-05-31T11:47:23+02:00 CHANNELMGR-638: remove unneeded div - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html Changes: = frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html = --- a/frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html +++ b/frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html @@ -15,12 +15,11 @@ --> - - - - + + \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/7145a7613799daa5e88f9cf61a6453f6021481fd ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1] CHANNELMGR-688: recommit delete
Mark Lenser pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
870375f2 by Mark at 2016-05-31T09:55:26+02:00
CHANNELMGR-688: recommit delete
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
@@ -121,7 +121,7 @@ export class HippoIframeCtrl {
.textContent(this.$translate.instant('CONFIRM_DELETE_COMPONENT_MESSAGE',
{
component: selectedComponent.getLabel(),
}))
- .ok(this.$translate.instant('REMOVE'))
+ .ok(this.$translate.instant('DELETE'))
.cancel(this.$translate.instant('CANCEL'));
return this.DialogService.show(confirm);
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -4,7 +4,7 @@
"CANCEL": "Cancel",
"CHANNEL_PROPERTIES_SAVE_SUCCESS": "Channel settings saved successfully",
"COLLAPSE": "Collapse",
- "CONFIRM_DELETE_COMPONENT_MESSAGE": "Remove component '{{component}}' from
this template?",
+ "CONFIRM_DELETE_COMPONENT_MESSAGE": "Delete component '{{component}}' from
this template?",
"CONFIRM_DELETE_PAGE_MESSAGE": "Delete '{{page}}'?",
"CONFIRM_DELETE_MENU_ITEM_MESSAGE": "Delete '{{menuItem}}'?",
"CONFIRM_DISCARD_CHANGES_MESSAGE": "Discard changes by '{{user}}'?",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/870375f21602edcad632d2074dce49d733ee5dca
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-638a] CHANNELMGR-688: Fix local parameters check
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-638a at cms-community
/ hippo-addon-channel-manager
Commits:
1f559106 by Mark at 2016-05-27T11:32:06+02:00
CHANNELMGR-688: Fix local parameters check
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/menu/editor.controller.js
- frontend-ng/src/angularjs/channel/menu/editor.html
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.controller.js
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.controller.js
+++ b/frontend-ng/src/angularjs/channel/menu/editor.controller.js
@@ -149,4 +149,8 @@ export class MenuEditorCtrl {
deleteItem(item) {
this._confirmDelete(item).then(() => this._doDelete(item));
}
+
+ hasLocalParameters(item) {
+return Object.keys(item.localParameters).length !== 0;
+ }
}
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -116,7 +116,7 @@
-
+
{{ 'ADVANCED_SETTINGS' | translate }}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1f559106a85f3f3909d85e19358cec80c33ba5a1
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-694
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-694 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-638a] 2 commits: CHANNELMGR-688: Keep subpage scroll
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-638a at cms-community
/ hippo-addon-channel-manager
Commits:
5c23ca65 by Mark at 2016-05-27T11:14:28+02:00
CHANNELMGR-688: Keep subpage scroll
- - - - -
07686ba2 by Mark at 2016-05-27T11:14:39+02:00
CHANNELMGR-688: Adjust the icons
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/styles/_subpage.scss
Changes:
=
frontend-ng/src/angularjs/channel/menu/editor.html
=
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -39,8 +39,8 @@
data-nodrag
stop-propagation>
- add_circle_outline
- remove_circle_outline
+ add
+ remove
{{ item.title }}
@@ -51,8 +51,8 @@
aria-label="{{ 'EDIT' | translate }}"
ng-click="menuEditor.editItem(item)">
- keyboard_arrow_down
- keyboard_arrow_up
+ expand_more
+ expand_less
=
frontend-ng/src/styles/_subpage.scss
=
--- a/frontend-ng/src/styles/_subpage.scss
+++ b/frontend-ng/src/styles/_subpage.scss
@@ -12,3 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+.subpage-feedback-parent > div {
+ overflow-y: scroll;
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/4b477a74747a370105a06add927a7c6ed4f4d1d3...07686ba2a143b0ad98b116264cd2f8524c943764
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1] CHANNELMGR-638: add layout-padding
Mark Lenser pushed to branch feature/cmng-psp1 at cms-community / hippo-addon-channel-manager Commits: fea02fda by Mark at 2016-05-31T12:44:41+02:00 CHANNELMGR-638: add layout-padding - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html Changes: = frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html = --- a/frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html +++ b/frontend-ng/src/angularjs/channel/subpage/content/subpageContent.html @@ -19,7 +19,11 @@ class="subpage-feedback-parent scroll-to-container qa-subpage" flex> - + \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fea02fda4d13d3a5ceae26302976ccf9ea6e45f3 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-673
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-673 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-668
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-668 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-642] CHANNELMGR-642: Change raised and primary
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-642 at cms-community
/ hippo-addon-channel-manager
Commits:
43ead825 by Mark at 2016-05-19T16:47:21+02:00
CHANNELMGR-642: Change raised and primary
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/changes/manage.html
Changes:
=
frontend-ng/src/angularjs/channel/changes/manage.html
=
--- a/frontend-ng/src/angularjs/channel/changes/manage.html
+++ b/frontend-ng/src/angularjs/channel/changes/manage.html
@@ -38,16 +38,17 @@
-
- {{ 'SUBPAGE_CHANGEMANAGEMENT_PUBLISH' | translate }}
-
-
-
- {{ 'SUBPAGE_CHANGEMANAGEMENT_DISCARD' | translate }}
-
+
+
+{{ 'SUBPAGE_CHANGEMANAGEMENT_DISCARD' | translate }}
+
+
+{{ 'SUBPAGE_CHANGEMANAGEMENT_PUBLISH' | translate }}
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/43ead825c4c4198fb67afea918417fda6fb5e7fa
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-638] CHANNELMGR-638: scss
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-638 at cms-community
/ hippo-addon-channel-manager
Commits:
8ba2c2b7 by Mark at 2016-05-23T14:19:28+02:00
CHANNELMGR-638: scss
- - - - -
1 changed file:
- frontend-ng/src/styles/_buttons.scss
Changes:
=
frontend-ng/src/styles/_buttons.scss
=
--- a/frontend-ng/src/styles/_buttons.scss
+++ b/frontend-ng/src/styles/_buttons.scss
@@ -74,3 +74,9 @@ button .disabled-marker {
font-style: italic;
}
+.fab-wrap {
+ position: relative;
+}
+.fab-space-holder {
+ margin-bottom: 80px;
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8ba2c2b72cb0a05f9f1f518bac2668845921a297
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-688
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-688 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/cmng-psp1-CHANNELMGR-685
Mark Lenser pushed new branch feature/cmng-psp1-CHANNELMGR-685 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1-CHANNELMGR-685] 2 commits: CHANNELMGR-685: Align the title or content - favoring content and only using tit…
Mark Lenser pushed to branch feature/cmng-psp1-CHANNELMGR-685 at cms-community
/ hippo-addon-channel-manager
Commits:
77f2f2b4 by Mark at 2016-05-25T09:52:44+02:00
CHANNELMGR-685: Align the title or content - favoring content and only using
title when it adds value. Also align the normal dialog.
- - - - -
b8c1f699 by Mark at 2016-05-25T09:52:54+02:00
Merge remote-tracking branch 'origin/feature/cmng-psp1-CHANNELMGR-685' into
feature/cmng-psp1-CHANNELMGR-685
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
- frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
- frontend-ng/src/i18n/en.json
- frontend-ng/src/i18n/nl.json
Changes:
=
frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
=
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.controller.js
@@ -110,7 +110,6 @@ export class PageEditCtrl {
this.$mdDialog.show(
this.$mdDialog.alert()
.clickOutsideToClose(true)
- .title(this.$translate.instant('SUBPAGE_PAGE_EDIT_ALERT_TITLE'))
.textContent(textContent)
.ok(this.$translate.instant('ALERT_OK'))
);
=
frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
=
--- a/frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
+++ b/frontend-ng/src/angularjs/channel/page/actions/pageActions.controller.js
@@ -127,7 +127,7 @@ export class PageActionsCtrl {
_confirmDelete(page) {
const confirm = this.DialogService.confirm()
- .title(this.$translate.instant('CONFIRM_DELETE_PAGE_MESSAGE', { page }))
+ .textContent(this.$translate.instant('CONFIRM_DELETE_PAGE_MESSAGE', {
page }))
.ok(this.$translate.instant('DELETE'))
.cancel(this.$translate.instant('CANCEL'));
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -71,9 +71,8 @@
"SUBPAGE_PAGE_COPY_LABEL_URL_STEM": "Destination URL",
"SUBPAGE_PAGE_COPY_TITLE": "Copy page '{{pageName}}'",
"SUBPAGE_PAGE_CREATE_TITLE": "Create page",
- "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REMOVAL": "The selected template does not
have any containers. All container items on this page are deleted when this
template is assigned.",
- "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REPOSITIONING": "The container items on
this page will be repositioned when this template is assigned.",
- "SUBPAGE_PAGE_EDIT_ALERT_TITLE": "Assign a new template",
+ "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REMOVAL": "The selected template does not
have any containers. Container items on this page will be removed when this
page is saved with this template",
+ "SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REPOSITIONING": "Container items on this
page will be repositioned when this page is saved with this template",
"SUBPAGE_PAGE_EDIT_LABEL_ASSIGN_NEW_TEMPLATE": "Assign a new template",
"SUBPAGE_PAGE_EDIT_LABEL_PRIMARY_DOCUMENT": "Primary Document",
"SUBPAGE_PAGE_EDIT_PRIMARY_DOCUMENT_VALUE_NONE": "None",
=
frontend-ng/src/i18n/nl.json
=
--- a/frontend-ng/src/i18n/nl.json
+++ b/frontend-ng/src/i18n/nl.json
@@ -50,7 +50,7 @@
"MOVE": "Verplaats",
"PUBLISH": "Publiceer",
"PUBLISH_ALL": "Publiceer alles",
- "REMOVE": "Remove",
+ "REMOVE": "???",
"SAVE": "Sla op",
"SIDENAV_TAB_COMPONENTS": "Componenten",
"SIDENAV_TAB_SITEMAP": "Sitemap",
@@ -66,7 +66,6 @@
"SUBPAGE_PAGE_CREATE_TITLE": "Maak pagina aan",
"SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REMOVAL": "???",
"SUBPAGE_PAGE_EDIT_ALERT_CONTENT_REPOSITIONING": "???",
- "SUBPAGE_PAGE_EDIT_ALERT_TITLE": "Gebruik een nieuwe template",
"SUBPAGE_PAGE_EDIT_LABEL_ASSIGN_NEW_TEMPLATE": "Gebruik een nieuwe template",
"SUBPAGE_PAGE_EDIT_LABEL_PRIMARY_DOCUMENT": "Primair document",
"SUBPAGE_PAGE_EDIT_PRIMARY_DOCUMENT_VALUE_NONE": "Geen",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/7b150510f2b19980d064cc288d561b2531cc8fed...b8c1f699f3e204d42b759e2666057c1e42b4870a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-842
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-842 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-842] CHANNELMGR-842 Rename images for left-side-panel
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-842 at cms-community / hippo-addon-channel-manager Commits: 5cc0798a by Mark at 2016-09-06T14:00:20+02:00 CHANNELMGR-842 Rename images for left-side-panel - - - - - 2 changed files: - frontend-ng/src/images/sidenav-arrow-left.svg → frontend-ng/src/images/left-side-panel-arrow-left.svg - frontend-ng/src/images/sidenav-arrow-right.svg → frontend-ng/src/images/left-side-panel-arrow-right.svg Changes: = frontend-ng/src/images/sidenav-arrow-left.svg → frontend-ng/src/images/left-side-panel-arrow-left.svg = --- a/frontend-ng/src/images/sidenav-arrow-left.svg +++ b/frontend-ng/src/images/left-side-panel-arrow-left.svg = frontend-ng/src/images/sidenav-arrow-right.svg → frontend-ng/src/images/left-side-panel-arrow-right.svg = --- a/frontend-ng/src/images/sidenav-arrow-right.svg +++ b/frontend-ng/src/images/left-side-panel-arrow-right.svg View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5cc0798a1396ab00719dd10895bf7a8f536f36e6 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-842] 4 commits: CHANNELMGR-842 fix watch to close left panel on exiting edit mode
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-842 at
cms-community / hippo-addon-channel-manager
Commits:
7a67f0db by Mark at 2016-09-06T16:25:12+02:00
CHANNELMGR-842 fix watch to close left panel on exiting edit mode
- - - - -
2faaf93f by Mark at 2016-09-06T16:29:01+02:00
CHANNELMGR-842 refactor watch to be in a function
- - - - -
a66878d6 by Mark at 2016-09-06T16:30:43+02:00
Merge branch feature/visual-editing-psp1-CHANNELMGR-842 of
code.onehippo.org:cms-community/hippo-addon-channel-manager into
feature/visual-editing-psp1-CHANNELMGR-842
- - - - -
424a38b7 by Mark at 2016-09-06T16:40:16+02:00
CHANNELMGR-842 toggle as a component
- - - - -
5 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
- frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.component.js
- −
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.directive.js
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.html
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.component.js
@@ -18,16 +18,20 @@ export class ChannelLeftSidePanelCtrl {
constructor($scope, $element, ChannelSidePanelService, ChannelService,
SiteMapService, HippoIframeService) {
'ngInject';
+this.$scope = $scope;
this.ChannelService = ChannelService;
this.ChannelSidePanelService = ChannelSidePanelService;
this.SiteMapService = SiteMapService;
this.HippoIframeService = HippoIframeService;
ChannelSidePanelService.initialize('left',
$element.find('.channel-left-side-panel'));
+this.closePanelOnEditModeTurnedOff();
+ }
-$scope.$watch('leftSidePanel.editMode', () => {
+ closePanelOnEditModeTurnedOff() {
+this.$scope.$watch('$ctrl.editMode', () => {
if (!this.editMode) {
-ChannelSidePanelService.close('left');
+this.ChannelSidePanelService.close('left');
}
});
}
=
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.js
@@ -15,14 +15,12 @@
*/
import { ChannelSidePanelService } from './../sidePanel.service';
-import { ChannelLeftSidePanelToggleCtrl } from
'./leftSidePanelToggle.controller';
-import { channelLeftSidePanelToggleDirective } from
'./leftSidePanelToggle.directive';
+import channelLeftSidePanelToggleComponentModule from
'./leftSidePanelToggle.component.js';
import channelLeftSidePanelComponentModule from './leftSidePanel.component';
export const channelLeftSidePanelModule = angular
.module('hippo-cm.channel.leftSidePanel', [
+channelLeftSidePanelToggleComponentModule.name,
channelLeftSidePanelComponentModule.name,
])
- .service('ChannelSidePanelService', ChannelSidePanelService)
- .controller('ChannelLeftSidePanelToggleCtrl', ChannelLeftSidePanelToggleCtrl)
- .directive('channelLeftSidePanelToggle',
channelLeftSidePanelToggleDirective);
+ .service('ChannelSidePanelService', ChannelSidePanelService);
=
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.controller.js
→
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.controller.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.component.js
@@ -30,3 +30,15 @@ export class ChannelLeftSidePanelToggleCtrl {
return this.ChannelSidePanelService.isOpen('left');
}
}
+
+const channelLeftSidePanelToggleComponentModule = angular
+ .module('hippo-cm.channel.leftSidePanelToggleComponentModule', [])
+ .component('channelLeftSidePanelToggle', {
+bindings: {
+ disabled: '=',
+},
+controller: ChannelLeftSidePanelToggleCtrl,
+templateUrl: 'channel/sidePanels/leftSidePanel/leftSidePanelToggle.html',
+ });
+
+export default channelLeftSidePanelToggleComponentModule;
=
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanelToggle.directive.js
deleted
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSid
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-841
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-841 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-841
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-841 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-841
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-841 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-842
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-842 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-843
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-843 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-841] CHANNELMGR-841 lint
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at
cms-community / hippo-addon-channel-manager
Commits:
68b1cd72 by Mark at 2016-09-13T09:37:42+02:00
CHANNELMGR-841 lint
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
@@ -247,7 +247,7 @@ describe('hippoIframeCtrl', () => {
const tooltip = hippoIframeCtrl.getContentLinkTooltip({
metaData: {
holderName: 'test',
- }
+ },
});
expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('LOCKED_BY'), {
user: 'test' });
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/68b1cd727792234aa9e0e8deaecef1e7da726a73
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-841] CHANNELMGR-841 icon data binding
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at
cms-community / hippo-addon-channel-manager
Commits:
88de112c by Mark at 2016-09-13T09:42:34+02:00
CHANNELMGR-841 icon data binding
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
@@ -48,7 +48,7 @@
+
md-svg-src="{{iframe.getContentLinkIcon(contentLink)}}">
{{iframe.getContentLinkTooltip(contentLink)}}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/88de112c92da17eba5e34371c0df77a3d98366e7
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-841] CHANNELMGR-841 data-binding on aria label
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at
cms-community / hippo-addon-channel-manager
Commits:
dcd9b1f7 by Mark at 2016-09-13T09:51:44+02:00
CHANNELMGR-841 data-binding on aria label
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
@@ -21,7 +21,6 @@
-
-
+test
-
{{iframe.getContentLinkTooltip(contentLink)}}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/dcd9b1f70bd88ff7b14aa61b278624d4129c5239
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-841] CHANNELMGR-841 holderId and holderName
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at
cms-community / hippo-addon-channel-manager
Commits:
fabeb78f by Mark at 2016-09-12T16:05:36+02:00
CHANNELMGR-841 holderId and holderName
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js
@@ -210,12 +210,11 @@ export class HippoIframeCtrl {
}
contentIsLocked(contentLink) {
-return typeof contentLink.metaData.holder !== 'undefined'; // TODO:
replace when HSTTWO-3797 is complete
+return typeof contentLink.metaData.holderId !== 'undefined';
}
openContent(contentLink) {
-const holder = contentLink.metaData.holder; // TODO: replace when
HSTTWO-3797 is complete
-if (this.contentIsLocked(contentLink) && holder && holder.userName !==
this.config.cmsUser) {
+if (this.contentIsLocked(contentLink) && contentLink.metaData.holderId !==
this.config.cmsUser) {
this.CmsService.publish('open-content', contentLink.getUuid());
} else {
this.ChannelSidePanelService.open('right');
@@ -225,7 +224,7 @@ export class HippoIframeCtrl {
getContentLinkTooltip(contentLink) {
let result;
if (this.contentIsLocked(contentLink)) {
- result = this.$translate.instant('LOCKED_BY', { user:
contentLink.metaData.holder.userName });
+ result = this.$translate.instant('LOCKED_BY', { user:
contentLink.metaData.holderName });
} else {
result = this.$translate.instant('EDIT_CONTENT');
}
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
@@ -197,9 +197,7 @@ describe('hippoIframeCtrl', () => {
const contentLinkComment = $j('')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
uuid: '1234',
- holder: {
-userName: 'test',
- }, // TODO: replace when HSTTWO-3797 is complete
+ holderId: 'test',
});
let locked = hippoIframeCtrl.contentIsLocked(contentLink);
@@ -211,9 +209,7 @@ describe('hippoIframeCtrl', () => {
const contentLinkComment = $j('')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
uuid: '1234',
- holder: {
-userName: 'differentUser',
- },
+ holderName: 'differentUser',
});
hippoIframeCtrl.config = {
cmsUser: 'test',
@@ -255,15 +251,13 @@ describe('hippoIframeCtrl', () => {
const contentLinkComment = $j('')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
uuid: '1234',
- holder: {
-userName: 'test',
- }
+ holderName: 'test',
});
spyOn(hippoIframeCtrl, 'contentIsLocked').and.returnValue(true);
let tooltip = hippoIframeCtrl.getContentLinkTooltip(contentLink);
-expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('LOCKED_BY'), {
user: contentLink.metaData.holder.userName });
+expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('LOCKED_BY'), {
user: contentLink.metaData.holderName });
});
it('calls the registered callback for editing a menu', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fabeb78f98fc06aebb8bcbf6d3b21a38ebdf1b6d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-841] CHANNELMGR-841 fix lint errors
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at
cms-community / hippo-addon-channel-manager
Commits:
1861b3db by Mark at 2016-09-12T16:12:45+02:00
CHANNELMGR-841 fix lint errors
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.spec.js
@@ -31,7 +31,6 @@ describe('hippoIframeCtrl', () => {
let PageMetaDataService;
let ChannelService;
let CmsService;
- let ConfigService;
let ChannelSidePanelService;
let HippoIframeService;
let DialogService;
@@ -50,7 +49,7 @@ describe('hippoIframeCtrl', () => {
inject(($controller, _$rootScope_, _$compile_, _$q_, _DragDropService_,
_OverlaySyncService_,
_PageStructureService_, _ScalingService_,
_hstCommentsProcessorService_, _PageMetaDataService_,
-_ChannelService_, _CmsService_, _ConfigService_,
_ChannelSidePanelService_, _HippoIframeService_,
+_ChannelService_, _CmsService_, _ChannelSidePanelService_,
_HippoIframeService_,
_DialogService_, _DomService_) => {
$rootScope = _$rootScope_;
$compile = _$compile_;
@@ -63,7 +62,6 @@ describe('hippoIframeCtrl', () => {
PageMetaDataService = _PageMetaDataService_;
ChannelService = _ChannelService_;
CmsService = _CmsService_;
- ConfigService = _ConfigService_;
ChannelSidePanelService = _ChannelSidePanelService_;
HippoIframeService = _HippoIframeService_;
DialogService = _DialogService_;
@@ -185,10 +183,10 @@ describe('hippoIframeCtrl', () => {
it('checks if content is unlocked', () => {
const contentLinkComment = $j('')[0];
const contentLink = new EmbeddedLink(contentLinkComment, {
- uuid: '1234'
+ uuid: '1234',
});
-let locked = hippoIframeCtrl.contentIsLocked(contentLink);
+const locked = hippoIframeCtrl.contentIsLocked(contentLink);
expect(locked).toBe(false);
});
@@ -200,7 +198,7 @@ describe('hippoIframeCtrl', () => {
holderId: 'test',
});
-let locked = hippoIframeCtrl.contentIsLocked(contentLink);
+const locked = hippoIframeCtrl.contentIsLocked(contentLink);
expect(locked).toBe(true);
});
@@ -242,7 +240,7 @@ describe('hippoIframeCtrl', () => {
});
spyOn(hippoIframeCtrl, 'contentIsLocked').and.returnValue(false);
-let tooltip = hippoIframeCtrl.getContentLinkTooltip(contentLink);
+const tooltip = hippoIframeCtrl.getContentLinkTooltip(contentLink);
expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('EDIT_CONTENT'));
});
@@ -255,7 +253,7 @@ describe('hippoIframeCtrl', () => {
});
spyOn(hippoIframeCtrl, 'contentIsLocked').and.returnValue(true);
-let tooltip = hippoIframeCtrl.getContentLinkTooltip(contentLink);
+const tooltip = hippoIframeCtrl.getContentLinkTooltip(contentLink);
expect(tooltip).toBe(hippoIframeCtrl.$translate.instant('LOCKED_BY'), {
user: contentLink.metaData.holderName });
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1861b3db8296c20b7b19efeb0815a2ed792dbc27
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-841] CHANNELMGR-841 remove test
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-841 at cms-community / hippo-addon-channel-manager Commits: ffbe3f1d by Mark at 2016-09-13T09:59:29+02:00 CHANNELMGR-841 remove test - - - - - 1 changed file: - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html Changes: = frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html = --- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html +++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html @@ -42,7 +42,6 @@ -test View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ffbe3f1d615870a89b8533b789de8079f9761f3d ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] 3 commits: CHANNELMGR-843 side causes problems
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
bf511d58 by Mark at 2016-10-06T12:36:50+02:00
CHANNELMGR-843 side causes problems
- - - - -
9149ef17 by Mark at 2016-10-10T12:35:09+02:00
CHANNELMGR-843 fix some tests
- - - - -
36862167 by Mark at 2016-10-10T12:35:17+02:00
CHANNELMGR-843 work on mobile
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
@@ -50,7 +50,7 @@ export class ScalingService {
setPushWidth(side, pushWidth) {
this.panels[side].pushWidth = pushWidth;
-this._updateScaling(side);
+this._updateScaling();
}
setViewPortWidth(viewPortWidth) {
@@ -70,21 +70,22 @@ export class ScalingService {
* i.e. the iframe and the overlay, in or out. In case the scale factor
changes due to opening/closing the left side panel,
* which is animated by material, we also animate the zooming and do an
attempt to keep the scroll position of the iframe unchanged.
*/
- _updateScaling(side) {
+ _updateScaling() {
if (!this.hippoIframeJQueryElement ||
!this.hippoIframeJQueryElement.is(':visible')) {
return;
}
const iframeWrapper = this.hippoIframeJQueryElement.parent();
const iframeWrapperWidth = iframeWrapper.width();
+const viewPortWidth = this.OverlaySyncService.getViewPortWidth();
const iframeContentWidth = iframeWrapperWidth -
(this.panels.left.pushWidth + this.panels.right.pushWidth);
const oldScale = this.scaleFactor;
-if (iframeWrapperWidth > 1280) {
- return; // only scale when we're below 1280 width as that is our lowest
supported width
-}
+let newScale = Math.min(iframeContentWidth / iframeWrapperWidth, 1);
-const newScale = Math.min(iframeContentWidth / iframeWrapperWidth, 1);
+if ((viewPortWidth !== 0 && iframeContentWidth >= viewPortWidth) ||
iframeContentWidth >= 1280) {
+ newScale = 1;
+}
if (newScale !== oldScale) {
const iframeBase =
this.hippoIframeJQueryElement.find('.channel-iframe-base');
@@ -119,9 +120,9 @@ export class ScalingService {
if (this.panels.left.pushWidth && this.panels.right.pushWidth) {
elementsToScale.css('transform-origin', 'top center');
- } else if ((!this.panels.left.pushWidth && this.panels.right.pushWidth)
|| side === 'right') {
+ } else if ((!this.panels.left.pushWidth && this.panels.right.pushWidth))
{
elementsToScale.css('transform-origin', 'top left');
- } else if ((this.panels.left.pushWidth && !this.panels.right.pushWidth)
|| side === 'left') {
+ } else if ((this.panels.left.pushWidth && !this.panels.right.pushWidth))
{
elementsToScale.css('transform-origin', 'top right');
}
}
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
@@ -127,7 +127,6 @@ describe('ScalingService', () => {
it('should do nothing when the viewport width of an uninitialized service is
changed', () => {
ScalingService.setViewPortWidth(720);
-expect(iframeJQueryElement.css).not.toHaveBeenCalled();
expect(elementsToScale.css).not.toHaveBeenCalled();
expect(ScalingService.getScaleFactor()).toEqual(1.0);
});
@@ -137,7 +136,6 @@ describe('ScalingService', () => {
ScalingService.init(iframeJQueryElement);
ScalingService.setViewPortWidth(0);
-
expect(iframeJQueryElement.css.calls.mostRecent().args).toEqual(['transform',
'translateX(0)']);
expect(ScalingService.getScaleFactor()).toEqual(1.0);
});
@@ -146,7 +144,6 @@ describe('ScalingService', () => {
ScalingService.init(iframeJQueryElement);
ScalingService.setViewPortWidth(720);
-
expect(iframeJQueryElement.css.calls.mostRecent().args).toEqual(['transform',
'translateX(0)']);
expect(ScalingService.getScaleFactor()).toEqual(1.0);
});
@@ -157,24 +154,18 @@ describe('ScalingService', () => {
expect(elementsToScale.css.calls.mostRecent().args).toEqual(['transform',
'scale(0.5)']);
expect(ScalingService.getScaleFactor()).toEqual(0.5);
-
-
expect(iframeJQueryElement.css.calls.mostRecent().args).toEqual(['transform',
'translateX(-400)']);
});
- it('should start shifting and scaling when pushing the visible canvas width
below the viewport wid
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-865
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-865 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843 we are always animating with css now
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
9d961a77 by Mark at 2016-09-22T14:57:26+02:00
CHANNELMGR-843 we are always animating with css now
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
@@ -69,7 +69,6 @@ export class ScalingService {
* The iframe should be shifted right (by controlling the translateX) if the
left side panel is open,
* and if the viewport width is less than the available canvas
*
- * @param animate flag indicating whether any shift-change should be
automated or immediate.
* @returns {*[]} canvasWidth is the maximum width available to the iframe
* viewPortWidth indicates how many pixels wide the iframe
content should be rendered.
*/
@@ -93,13 +92,9 @@ export class ScalingService {
*
* We compute the new scale factor and compare it to the old one. In case of
a change, we zoom the "elementsToScale",
* i.e. the iframe and the overlay, in or out. In case the scale factor
changes due to opening/closing the left side panel,
- * which is animated by material, we also animate the zooming and do an
attempt to keep the scroll position of the
- * iframe unchanged. Other changes (window resize, viewport width change)
are not animated and we don't worry much
- * about the scroll position.
- *
- * @param animate flag indicating that any change should be animated.
+ * which is animated by material, we also animate the zooming and do an
attempt to keep the scroll position of the iframe unchanged.
*/
- _updateScaling(side, animate) {
+ _updateScaling(side) {
if (!this.hippoIframeJQueryElement ||
!this.hippoIframeJQueryElement.is(':visible')) {
return;
}
@@ -120,36 +115,32 @@ export class ScalingService {
}
elementsToScale.velocity('finish');
- if (animate) {
-const iframeBaseJQueryElement =
this.hippoIframeJQueryElement.find('.channel-iframe-base');
-const currentOffset = iframeBaseJQueryElement.scrollTop();
-const targetOffset = oldScale === 1.0 ? newScale * currentOffset :
currentOffset / oldScale;
-
-if (targetOffset !== currentOffset) {
- // keep scroll-position constant during animation
- elementsToScale.velocity('scroll', {
-container: iframeBaseJQueryElement,
-offset: targetOffset - currentOffset,
-duration: this.scaleDuration,
-easing: this.scaleEasing,
-queue: false,
- });
-}
-elementsToScale.css('transform', `scale(${newScale})`);
- } else {
-elementsToScale.css('transform', `scale(${newScale})`);
+ const iframeBaseJQueryElement =
this.hippoIframeJQueryElement.find('.channel-iframe-base');
+ const currentOffset = iframeBaseJQueryElement.scrollTop();
+ const targetOffset = oldScale === 1.0 ? newScale * currentOffset :
currentOffset / oldScale;
+
+ if (targetOffset !== currentOffset) {
+// keep scroll-position constant during animation
+elementsToScale.velocity('scroll', {
+ container: iframeBaseJQueryElement,
+ offset: targetOffset - currentOffset,
+ duration: this.scaleDuration,
+ easing: this.scaleEasing,
+ queue: false,
+});
}
+ elementsToScale.css('transform', `scale(${newScale})`);
}
this.scaleFactor = newScale;
}
- _resyncScaling(animate) {
+ _resyncScaling() {
if (!this.hippoIframeJQueryElement ||
!this.hippoIframeJQueryElement.is(':visible')) {
return;
}
const elementsToScale = this.hippoIframeJQueryElement.find('.cm-scale');
const side = (elementsToScale.hasClass('cm-scale-to-left') ? 'right' :
'left');
-this._updateScaling(side, animate);
+this._updateScaling(side);
}
}
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
@@ -59,7 +59,7 @@ describe('ScalingService', () => {
expect(ScalingService.getScaleFactor()).toEqual(1.0);
});
- it('should change the scaling factor animated when setting pushWidth', () =>
{
+ it('should change the scaling factor when setting pushWidth', () => {
canvasJQueryElement.width(400);
ScalingService.init(iframeJQueryElement);
@@ -69,7 +69,7 @@ descr
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] 2 commits: CHANNELMGR-843 add dummy content
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
e101db1c by Mark at 2016-09-20T16:03:21+02:00
CHANNELMGR-843 add dummy content
- - - - -
1c1c6ad3 by Mark at 2016-09-20T16:44:24+02:00
CHANNELMGR-843 do not close the other panel when opening one
- - - - -
3 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
- frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
- frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
@@ -25,7 +25,14 @@
{{'EDIT_DOCUMENT' | translate }}
-Right Side Panel
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod
tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
{{'SAVE' | translate }}
=
frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
+++ b/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
@@ -34,10
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843 move comment
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
a326ee35 by Mark at 2016-09-22T15:13:07+02:00
CHANNELMGR-843 move comment
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
@@ -120,14 +120,13 @@ export class ScalingService {
const targetOffset = oldScale === 1.0 ? newScale * currentOffset :
currentOffset / oldScale;
if (targetOffset !== currentOffset) {
-// keep scroll-position constant during animation
elementsToScale.velocity('scroll', {
container: iframeBaseJQueryElement,
offset: targetOffset - currentOffset,
duration: this.scaleDuration,
easing: this.scaleEasing,
queue: false,
-});
+}); // keep scroll-position constant during animation
}
elementsToScale.css('transform', `scale(${newScale})`);
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a326ee35fddad762a78458b425a4074ff6fd0374
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843 fix tests
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
8161d1ac by Mark at 2016-09-26T16:37:19+02:00
CHANNELMGR-843 fix tests
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html
@@ -14,11 +14,13 @@
~ limitations under the License.
-->
-
-
-
-
-
+
+
+
+
+
+
+
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
@@ -19,6 +19,7 @@ describe('ScalingService', () => {
let ScalingService;
let iframeJQueryElement;
+ let iframeWrapper;
let baseJQueryElement;
let canvasJQueryElement;
let elementsToScale;
@@ -32,11 +33,13 @@ describe('ScalingService', () => {
jasmine.getFixtures().load('channel/hippoIframe/scaling.service.fixture.html');
+iframeWrapper = $j('.channel-iframe-wrapper');
baseJQueryElement = $j('.channel-iframe-base');
canvasJQueryElement = $j('.channel-iframe-canvas');
elementsToScale = jasmine.createSpyObj('elementsToScale', ['velocity',
'css', 'scrollTop', 'hasClass', 'removeClass', 'addClass']);
-iframeJQueryElement = jasmine.createSpyObj('iframeJQueryElement', ['find',
'css', 'velocity', 'is']);
+iframeJQueryElement = jasmine.createSpyObj('iframeJQueryElement',
['parent', 'find', 'css', 'velocity', 'is']);
+iframeJQueryElement.parent.and.callFake(() =>
$j('#test-hippo-iframe-wrapper'));
iframeJQueryElement.find.and.callFake((selector) => {
if (selector === '.cm-scale') {
return elementsToScale;
@@ -45,6 +48,9 @@ describe('ScalingService', () => {
});
iframeJQueryElement.css.and.callFake(() => '0');
iframeJQueryElement.is.and.returnValue(true);
+
+
+iframeWrapper.width(400);
});
afterEach(() => {
@@ -55,7 +61,6 @@ describe('ScalingService', () => {
it('should initialize using the default values', () => {
ScalingService.init(iframeJQueryElement);
-expect(elementsToScale.css).not.toHaveBeenCalled();
expect(ScalingService.getScaleFactor()).toEqual(1.0);
});
@@ -82,15 +87,15 @@ describe('ScalingService', () => {
});
it('should change the scaling factor instantly when the window is resized',
() => {
-canvasJQueryElement.width(200);
+canvasJQueryElement.width(400);
ScalingService.init(iframeJQueryElement);
ScalingService.setPushWidth('left', 100);
-ScalingService.scaleFactor = 0.75; // fake different scaling factor so the
effect of the window resize is testable
+ScalingService.scaleFactor = 0.1; // fake different scaling factor so the
effect of the window resize is testable
$j(window).resize();
-expect(elementsToScale.css).toHaveBeenCalledWith('transform',
'scale(0.5)');
-expect(ScalingService.getScaleFactor()).toEqual(0.5);
+expect(elementsToScale.css).toHaveBeenCalledWith('transform',
'scale(0.75)');
+expect(ScalingService.getScaleFactor()).toEqual(0.75);
});
it('should update the scroll position instantly while scaling', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8161d1acaadb9346143fb5379de60f7f089b148c
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-986] CHANNELMGR-986 make changes to the DOM and css to get the structure to work with…
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-986 at
cms-community / hippo-addon-channel-manager
Commits:
1c7f5f25 by Mark at 2016-11-09T16:23:32+01:00
CHANNELMGR-986 make changes to the DOM and css to get the structure to work
with the new always array setup
- - - - -
3 changed files:
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.html
- frontend-ng/src/styles/_forms.scss
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -13,17 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
+
{{ ::fieldType.displayName }}
@@ -31,6 +26,11 @@
keyboard_arrow_down
@@ -42,7 +42,8 @@
-
-
+
=
frontend-ng/src/styles/_forms.scss
=
--- a/frontend-ng/src/styles/_forms.scss
+++ b/frontend-ng/src/styles/_forms.scss
@@ -26,42 +26,41 @@
}
}
-.field-wrapper {
- padding: $form-padding;
-}
-
-form {
- &> channel-fields {
+.top-level {
+ &> .field-wrapper {
&> .form-field-compound {
border-left: 3px solid $grey-500;
}
+&> .field {
+ padding: $form-padding;
+}
}
}
.form-field-compound {
- padding: 0 8px;
+ padding-left: 8px !important;
h5 {
-margin-left: -6px;
+margin-left: -8px;
+ }
+ &.form-field-focused {
+border-color: $blue-500 !important;
}
}
.form-field-focused {
- &.form-field-compound {
-border-color: $blue-500;
- }
- &> div {
-&> h5 {
+ &> h5 {
+color: $blue-500 !important;
+md-icon {
color: $blue-500 !important;
- md-icon {
-color: $blue-500 !important;
- }
}
}
}
+
channel-fields {
channel-fields {
md-input-container {
- margin-left: 6px;
+ margin-left: 18px;
}
}
}
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1c7f5f25fb590b77f05a84ce4f403cb6152fdbc0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-986
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-986 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-970] 2 commits: CHANNELMGR-970 fix styling based on Carolien feedback
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-970 at
cms-community / hippo-addon-channel-manager
Commits:
b6ff77f9 by Mark at 2016-11-07T14:49:58+01:00
CHANNELMGR-970 fix styling based on Carolien feedback
- - - - -
52173b24 by Mark at 2016-11-07T14:52:13+01:00
CHANNELMGR-970 remove errors if values is empty
- - - - -
4 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
- frontend-ng/src/styles/_forms.scss
- frontend-ng/src/styles/_variables.scss
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
@@ -26,7 +26,7 @@ export class ChannelFieldsCtrl {
}
getFieldAsArray(fieldId) {
-const field = this.fieldValues[fieldId];
+const field = this.fieldValues[fieldId] || [];
return angular.isArray(field) ? field : [field];
}
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/ede8910a68fc0c90e44897b39a451a30cb95a58b...52173b2452aee28d4e9e0aeebea02fc36791e1cf
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-970] CHANNELMGR-970 move repeat to the top level to prevent extra fields at the end
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-970 at
cms-community / hippo-addon-channel-manager
Commits:
d27c4346 by Mark at 2016-11-07T15:01:38+01:00
CHANNELMGR-970 move repeat to the top level to prevent extra fields at the end
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -29,13 +29,13 @@
-
-
+
+
keyboard_arrow_down
{{ ::fieldType.displayName }}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d27c4346a83b2e8b18a1e95287bdc820991aacbf
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-970] CHANNELMGR-970 fix css based on DOM changes
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-970 at
cms-community / hippo-addon-channel-manager
Commits:
ede8910a by Mark at 2016-11-07T14:23:57+01:00
CHANNELMGR-970 fix css based on DOM changes
- - - - -
1 changed file:
- frontend-ng/src/styles/_forms.scss
Changes:
=
frontend-ng/src/styles/_forms.scss
=
--- a/frontend-ng/src/styles/_forms.scss
+++ b/frontend-ng/src/styles/_forms.scss
@@ -40,7 +40,7 @@ form {
&.form-field-compound {
border-color: $blue-500;
}
- &> md-input-container {
+ &> div {
&> h5 {
color: $blue-500 !important;
md-icon {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/ede8910a68fc0c90e44897b39a451a30cb95a58b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-985 fix sass lint errors
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
645ac265 by Mark at 2016-11-08T11:56:28+01:00
CHANNELMGR-985 fix sass lint errors
- - - - -
1 changed file:
- frontend-ng/src/styles/_forms.scss
Changes:
=
frontend-ng/src/styles/_forms.scss
=
--- a/frontend-ng/src/styles/_forms.scss
+++ b/frontend-ng/src/styles/_forms.scss
@@ -66,4 +66,4 @@ channel-fields {
margin-left: 6px;
}
}
-}
\ No newline at end of file
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/645ac2658e75c0670f35a7fbd6aba86d113cf983
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-970] 4 commits: CHANNELMGR-970 add aria-label
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-970 at
cms-community / hippo-addon-channel-manager
Commits:
76865e69 by Mark at 2016-11-07T16:15:37+01:00
CHANNELMGR-970 add aria-label
- - - - -
62610190 by Mark at 2016-11-07T16:18:59+01:00
CHANNELMGR-970 aria-label
- - - - -
02102678 by Mark at 2016-11-07T16:21:28+01:00
CHANNELMGR-970 move comment
- - - - -
f6918f63 by Mark at 2016-11-07T17:13:52+01:00
CHANNELMGR-970 return empty array if the value cannot be found - for cases like
optional recursion
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
@@ -26,7 +26,10 @@ export class ChannelFieldsCtrl {
}
getFieldAsArray(fieldId) {
-const field = this.fieldValues[fieldId] || [];
+let field = this.fieldValues[fieldId];
+if (typeof field === 'undefined') {
+ field = [];
+}
return angular.isArray(field) ? field : [field];
}
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -45,8 +45,8 @@
+
-
@@ -81,6 +84,7 @@
ng-if="!fieldType.multiple"
ng-model="$ctrl.fieldValues[fieldType.id]"
placeholder=""
+aria-label="{{::fieldType.displayName}}"
md-no-resize
ng-focus="$ctrl.onFieldFocus(fieldType)"
ng-blur="$ctrl.onFieldBlur(fieldType)">
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/d27c4346a83b2e8b18a1e95287bdc820991aacbf...f6918f639dd320cda2c81c0b27726ecc4889742f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-988
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-988 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843: remove un-needed class
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at cms-community / hippo-addon-channel-manager Commits: 6faac620 by Mark at 2016-10-19T10:53:17+02:00 CHANNELMGR-843: remove un-needed class - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/channel.html - frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html Changes: = frontend-ng/src/angularjs/channel/channel.html = --- a/frontend-ng/src/angularjs/channel/channel.html +++ b/frontend-ng/src/angularjs/channel/channel.html @@ -61,7 +61,7 @@ - + - + View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6faac620c0f416bc435282297c2656220c219ab5 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843: remove scaling fixture
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at cms-community / hippo-addon-channel-manager Commits: 8c0cced6 by Mark at 2016-10-19T10:57:08+02:00 CHANNELMGR-843: remove scaling fixture - - - - - 1 changed file: - − frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html Changes: = frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html deleted = --- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8c0cced6045c617d797c30837028bc3289288d60 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-942 bump frontend-build to 4.0.3
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
fb29dc4c by Mark at 2016-10-19T13:07:25+02:00
CHANNELMGR-942 bump frontend-build to 4.0.3
- - - - -
1 changed file:
- frontend-ng/package.json
Changes:
=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -38,6 +38,6 @@
},
"devDependencies": {
"angular-mocks": "1.5.8",
-"frontend-build": "4.0.2"
+"frontend-build": "4.0.3"
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/fb29dc4cbc7f340db23f7e9cb3dbdc2faf166670
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843: temporary code for demo - big side panel
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
8fc32ec0 by Mark at 2016-10-14T10:32:55+02:00
CHANNELMGR-843: temporary code for demo - big side panel
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
- frontend-ng/src/styles/_side-panel.scss
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
+++ b/frontend-ng/src/angularjs/channel/sidePanels/sidePanel.service.js
@@ -45,7 +45,11 @@ export class ChannelSidePanelService {
open(side) {
if (!this.isOpen(side)) {
this.$mdSidenav(this.panels[side].element).open();
- this.ScalingService.setPushWidth(side,
this.panels[side].jQueryElement.width());
+ let sidePanelWidth = this.panels[side].jQueryElement.width();
+ if (side === 'right') {
+sidePanelWidth = 450;
+ }
+ this.ScalingService.setPushWidth(side, sidePanelWidth);
}
}
=
frontend-ng/src/styles/_side-panel.scss
=
--- a/frontend-ng/src/styles/_side-panel.scss
+++ b/frontend-ng/src/styles/_side-panel.scss
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+md-sidenav {
+ height: 100%;
+}
+
.md-button.md-icon-button.md-icon-button-left-side-panel {
padding-left: 0;
margin-left: 0;
@@ -22,6 +26,8 @@
}
.channel-right-side-panel {
border-left: 1px solid rgba(0, 0, 0, 0.12);
+ max-width: 450px !important;
+ width: 450px !important;
}
.list-item-active {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8fc32ec0be710b1035023091f5bae94d1528585e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] CHANNELMGR-843: 41.5% instead of center
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
4f5118bf by Mark at 2016-10-14T11:10:00+02:00
CHANNELMGR-843: 41.5% instead of center
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
@@ -119,11 +119,11 @@ export class ScalingService {
}
if (this.panels.left.pushWidth && this.panels.right.pushWidth) {
-elementsToScale.css('transform-origin', 'top center');
+elementsToScale.css('transform-origin', '41.5% top');
} else if ((!this.panels.left.pushWidth && this.panels.right.pushWidth))
{
-elementsToScale.css('transform-origin', 'top left');
+elementsToScale.css('transform-origin', 'left top');
} else if ((this.panels.left.pushWidth && !this.panels.right.pushWidth))
{
-elementsToScale.css('transform-origin', 'top right');
+elementsToScale.css('transform-origin', 'right top');
}
}
this.scaleFactor = newScale;
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4f5118bfe7fd000c2905bf2724b8f62c6c9bb111
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-946: remove unused classes
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community / hippo-addon-channel-manager Commits: 79e2692c by Mark at 2016-10-24T10:17:10+02:00 CHANNELMGR-946: remove unused classes - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html - frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.fixture.html Changes: = frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html = --- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html +++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html @@ -16,7 +16,7 @@ - + - + = frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.fixture.html = --- a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.fixture.html +++ b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.fixture.html @@ -17,7 +17,7 @@ - + View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/79e2692c9cba9d3f42dd6647e17d0b2545689a21 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-843] 2 commits: CHANNELMGR-843: still set viewport width
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-843 at
cms-community / hippo-addon-channel-manager
Commits:
8f30e8df by Mark at 2016-10-18T16:31:02+02:00
CHANNELMGR-843: still set viewport width
- - - - -
9f63c5b0 by Mark at 2016-10-18T16:33:21+02:00
CHANNELMGR-843: set min-width on desktop and fix test to account for that
- - - - -
3 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
-
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.spec.js
- frontend-ng/src/angularjs/channel/viewports/viewportToggle.controller.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
@@ -134,7 +134,8 @@ export class OverlaySyncService {
this.$iframe.css('min-width', '0');
if (this.viewPortWidth === 0) {
- // Desktop mode - no width constraints
+ // Desktop mode
+ this.$iframe.css('min-width', '1280px');
this.$sheet.css('max-width', 'none');
this.$iframe.width('');
this.$overlay.width('');
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.spec.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.spec.js
@@ -150,7 +150,7 @@ describe('OverlaySyncService', () => {
'max-width': 'none',
});
expect($iframe).toHaveCss({
-'min-width': '0px',
+'min-width': '1280px',
});
expect($iframe.height()).toEqual(600);
=
frontend-ng/src/angularjs/channel/viewports/viewportToggle.controller.js
=
--- a/frontend-ng/src/angularjs/channel/viewports/viewportToggle.controller.js
+++ b/frontend-ng/src/angularjs/channel/viewports/viewportToggle.controller.js
@@ -15,10 +15,11 @@
*/
export class ViewportToggleCtrl {
- constructor($translate) {
+ constructor($translate, OverlaySyncService) {
'ngInject';
this.$translate = $translate;
+this.OverlaySyncService = OverlaySyncService;
this.viewPorts = [
{
@@ -43,9 +44,15 @@ export class ViewportToggleCtrl {
activate() {
this.selectedViewPort = this.viewPorts[0];
+this.viewPortChanged();
}
getDisplayName(viewport) {
return this.$translate.instant(`VIEWPORT_${viewport.id}`);
}
+
+ viewPortChanged() {
+this.OverlaySyncService.setViewPortWidth(this.selectedViewPort.width);
+this.OverlaySyncService.syncIframe();
+ }
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/6ed9da450fa3b81329f44370369d02dbacb3fdd1...9f63c5b0f94bc13b485005994eb6a9bb61a63078
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-930
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-930 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-874 don't close right panel on going to edit mode
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
5deab513 by Mark at 2016-10-21T16:23:56+02:00
CHANNELMGR-874 dont close right panel on going to edit mode
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
@@ -28,7 +28,6 @@ export class ChannelRightSidePanelCtrl {
ChannelSidePanelService.initialize('right',
$element.find('.channel-right-side-panel'), (documentId) => {
this.openDocument(documentId);
});
-this.closePanelOnEditModeTurnedOff();
this._clearDocument();
}
@@ -68,14 +67,6 @@ export class ChannelRightSidePanelCtrl {
return this.ChannelSidePanelService.isOpen('right');
}
- closePanelOnEditModeTurnedOff() {
-this.$scope.$watch('$ctrl.editMode', () => {
- if (!this.editMode) {
-this.ChannelSidePanelService.close('right');
- }
-});
- }
-
isEmptyMultiple(field) {
return field.multiple && this.doc.fields[field.id].length === 0;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5deab51359e68bb48acfc6df99e32dec5f1ae01f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-874 fix tests
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
4e21e844 by Mark at 2016-10-21T16:46:46+02:00
CHANNELMGR-874 fix tests
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.spec.js
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/leftSidePanel/leftSidePanel.spec.js
@@ -62,7 +62,6 @@ describe('ChannelLeftSidePanel', () => {
instantiateController(false);
expect(ChannelSidePanelService.initialize).toHaveBeenCalled();
-expect(ChannelSidePanelService.close).toHaveBeenCalled();
});
it('knows when it is locked open', () => {
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
@@ -90,7 +90,6 @@ describe('ChannelRightSidePanel', () => {
it('initializes the channel right side panel service upon instantiation', ()
=> {
expect(ChannelSidePanelService.initialize).toHaveBeenCalled();
-expect(ChannelSidePanelService.close).toHaveBeenCalled();
expect($ctrl.doc).toBe(null);
expect($ctrl.docType).toBe(null);
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/4e21e8443ebf6f5b888782a2b66d57804798c849
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-912
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-912 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-912] CHANNELMGR-912: lint
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-912 at
cms-community / hippo-addon-channel-manager
Commits:
0db6b9d1 by Mark at 2016-11-11T17:16:58+01:00
CHANNELMGR-912: lint
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
@@ -67,10 +67,10 @@ export class ChannelRightSidePanelCtrl {
this.doc = {
info: {
editing: {
-state: "UNAVAILABLE"
- }
-}
- }
+state: 'UNAVAILABLE',
+ },
+},
+ };
}
});
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/0db6b9d1746fe4af6ef9eb490fb00a0ba95268b8
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-967
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-967 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-912] CHANNELMGR-912 update wording for now. Will be refined by Carolien
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-912 at
cms-community / hippo-addon-channel-manager
Commits:
d73024f0 by Mark at 2016-11-15T10:55:00+01:00
CHANNELMGR-912 update wording for now. Will be refined by Carolien
- - - - -
1 changed file:
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -141,10 +141,10 @@
"TOOLBAR_SWITCH_VIEWER_MODE_VIEW": "View",
"TOOLBAR_VIEW_AS_LABEL": "As viewed by:",
"TOOLBAR_VIEW_ON_LABEL": "On:",
- "UNAVAILABLE": "Cover unavailable and non valid document. TODO: Replace w/
Carolien",
- "UNAVAILABLE_ACCESS_DENIED": "Access denied. TODO: Replace w/ Carolien",
- "UNAVAILABLE_HELD_BY_OTHER_USER": "Held by another user. TODO: Replace w/
Carolien",
- "UNAVAILABLE_REQUEST_PENDING": "Request pending. TODO: Replace w/ Carolien",
+ "UNAVAILABLE": "The content cannot be edited here. *FULL EDITOR LINK*",
+ "UNAVAILABLE_CUSTOM_VALIDATION_PRESENT": "GET WORDING FROM CAROLIEN. REWORD
*FULL EDITOR LINK*",
+ "UNAVAILABLE_HELD_BY_OTHER_USER": "The document is locked by another user.
REWORD",
+ "UNAVAILABLE_REQUEST_PENDING": "The content is waiting to be
published/unpublished. REWORD",
"VALIDATION_ILLEGAL_CHARACTERS": "One or more invalid characters
({{characters}}) have been entered",
"VALIDATION_ILLEGAL_CHARACTERS_PATH_INFO_ELEMENT": "'/', ' ' and ':'",
"VALIDATION_REQUIRED": "This is required",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/d73024f0626bd5af6c559961d0768c57168dde10
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANELLMGR-919] CHANNELMGR-919 my "let tobi rename" overwrote tobi's rename. Fix that.
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANELLMGR-919 at
cms-community / hippo-addon-channel-manager
Commits:
dc3d9dfc by Mark at 2016-11-23T11:03:59+01:00
CHANNELMGR-919 my let tobi rename overwrote tobis rename. Fix
that.
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
@@ -58,9 +58,9 @@ export class ChannelRightSidePanelCtrl {
this._resizeTextareas();
});
})
- .catch((error) => {
-if (error) {
- this.doc = error.data;
+ .catch((response) => {
+if (response) {
+ this.doc = response.data;
this.state = this.doc.info.editing.state;
} else {
this.state = 'UNAVAILABLE_CONTENT';
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/dc3d9dfc9a0b391742f4eb0ef5243cfb4cd7652c
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANELLMGR-919] 2 commits: CHANNELMGR-919 let tobi rename
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANELLMGR-919 at
cms-community / hippo-addon-channel-manager
Commits:
0853a665 by Mark at 2016-11-22T17:02:12+01:00
CHANNELMGR-919 let tobi rename
- - - - -
f81a81ee by Mark at 2016-11-23T10:31:00+01:00
CHANNELMGR-919 translations
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
- frontend-ng/src/i18n/en.json
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.component.js
@@ -58,9 +58,9 @@ export class ChannelRightSidePanelCtrl {
this._resizeTextareas();
});
})
- .catch((response) => {
-if (response) {
- this.doc = response.data;
+ .catch((error) => {
+if (error) {
+ this.doc = error.data;
this.state = this.doc.info.editing.state;
} else {
this.state = 'UNAVAILABLE_CONTENT';
=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -66,6 +66,11 @@
"ERROR_SITEMAP_RETRIEVAL_FAILED": "Failed to retrieve the sitemap for the
current channel",
"ERROR_UPDATE_COMPONENT": "Failed to edit this component",
"ERROR_UPDATE_COMPONENT_ITEM_ALREADY_LOCKED": "Cannot update component: the
container is locked by '{{lockedBy}}'",
+ "ERROR_CARDINALITY_CHANGE": "Unable to save. The document contains invalid
content",
+ "ERROR_HOLDERSHIP_LOST": "Unable to save. The document is no longer yours to
edit",
+ "ERROR_INVALID_DATA": "Unable to save. The document contains invalid
content",
+ "ERROR_NOT_HOLDER": "Unable to save. The document isn't yours to edit",
+ "ERROR_UNABLE_TO_SAVE": "Unable to save",
"EXPAND": "Expand",
"EXPERIMENT_LABEL_COMPLETED": "Experiment completed",
"EXPERIMENT_LABEL_CREATED": "Experiment created",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/cf579eb7fc74b1423fc3bd773c9d5ee8678a3a9b...f81a81eebeca1ea3151cc76df1d2ff6b5958622a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANELLMGR-919] CHANNELMGR-919 add tests
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANELLMGR-919 at
cms-community / hippo-addon-channel-manager
Commits:
84cd68cd by Mark at 2016-11-23T11:01:35+01:00
CHANNELMGR-919 add tests
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/rightSidePanel.spec.js
@@ -23,6 +23,7 @@ describe('ChannelRightSidePanel', () => {
let CmsService;
let ContentService;
let HippoIframeService;
+ let FeedbackService;
let $ctrl;
let $scope;
@@ -78,6 +79,8 @@ describe('ChannelRightSidePanel', () => {
ChannelSidePanelService = jasmine.createSpyObj('ChannelSidePanelService',
['initialize', 'isOpen', 'close']);
ContentService = jasmine.createSpyObj('ContentService', ['createDraft',
'getDocumentType', 'saveDraft', 'deleteDraft']);
+FeedbackService = jasmine.createSpyObj('FeedbackService',
['showErrorResponse']);
+
CmsService = jasmine.createSpyObj('CmsService', ['publish']);
HippoIframeService = jasmine.createSpyObj('HippoIframeService',
['reload']);
@@ -91,6 +94,7 @@ describe('ChannelRightSidePanel', () => {
CmsService,
ContentService,
HippoIframeService,
+ FeedbackService,
}, {
editMode: false,
});
@@ -179,6 +183,43 @@ describe('ChannelRightSidePanel', () => {
expect(ContentService.saveDraft).not.toHaveBeenCalled();
});
+ it('shows a toast when document save fails', () => {
+const savedDoc = {
+ data: {
+reason: 'TEST',
+ },
+ id: '123',
+};
+ContentService.saveDraft.and.returnValue($q.reject(savedDoc));
+
+$ctrl.doc = testDocument;
+$ctrl.form.$pristine = false;
+$ctrl.saveDocument();
+
+expect(ContentService.saveDraft).toHaveBeenCalledWith(testDocument);
+
+$rootScope.$apply();
+
+expect(FeedbackService.showErrorResponse).toHaveBeenCalledWith(savedDoc,
'ERROR_TEST');
+ });
+
+ it('shows a toast when document save fails and there is no data returned',
() => {
+const savedDoc = {
+ id: '123',
+};
+ContentService.saveDraft.and.returnValue($q.reject(savedDoc));
+
+$ctrl.doc = testDocument;
+$ctrl.form.$pristine = false;
+$ctrl.saveDocument();
+
+expect(ContentService.saveDraft).toHaveBeenCalledWith(testDocument);
+
+$rootScope.$apply();
+
+expect(FeedbackService.showErrorResponse).toHaveBeenCalledWith(savedDoc,
'ERROR_UNABLE_TO_SAVE');
+ });
+
it('views the full content by saving changes, closing the panel and
publishing a view-content event', () => {
$ctrl.doc = testDocument;
ContentService.saveDraft.and.returnValue($q.resolve(testDocument));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/84cd68cd0a5f48b2ec7a079f5115a03c6c62158d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNLEMGR-993
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNLEMGR-993 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] 2 commits: CHANNELMGR-993 remove one-time binding constraint for document value-related bindings
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
73b85539 by Tobias Jeger at 2016-11-16T08:54:49+01:00
CHANNELMGR-993 remove one-time binding constraint for document value-related
bindings
- - - - -
1a318c88 by Mark at 2016-11-16T10:27:24+01:00
CHANNELMGR-993 Merge branch feature/visual-editing-psp1 into
feature/visual-editing-psp1-CHANNLEMGR-993
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -17,7 +17,7 @@
ng-switch="fieldType.type"
class="field-wrapper">
-
{{ ::fieldType.displayName }}
@@ -25,29 +25,29 @@
+ ng-repeat="fieldValue in $ctrl.fieldValues[fieldType.id]">
keyboard_arrow_down
{{ ::$ctrl.getDisplayNameForCompound(fieldType, $index) }}
+field-values="fieldValue.fields">
+ ng-if="$ctrl.hasValue(fieldType)">
{{ ::fieldType.displayName }}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/888942a59379e23ba9fbb913edd681be0b4524ce...1a318c88ea8c5e821503a6ee3e7f48f736c7edcc
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-967] 25 commits: CHANNELMGR-922 Add 'publish' button that views the full document
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-967 at cms-community / hippo-addon-channel-manager Commits: b6365071 by Mathijs den Burger at 2016-11-10T20:41:16+01:00 CHANNELMGR-922 Add publish button that views the full document - - - - - de5c0acf by Mathijs den Burger at 2016-11-10T20:53:23+01:00 CHANNELMGR-922 Add switch to full editor button It opens the full document editor. - - - - - cbbbcdb7 by Mathijs den Burger at 2016-11-11T14:02:06+01:00 CHANNELMGR-922 Disable switch to full editor button for now Its not fully complete yet (e.g. it does not save pending changes before switching to the full editor), so disable it to avoid confusion. - - - - - 5ca9db48 by Tobias Jeger at 2016-11-13T11:08:38+01:00 CHANNELMGR-887 Support CHOICE fields Quite some refactoring has happened (again) - both list- and compound-based choices are supported - choices only support compounds at the immediate child level - field validation is performed on actual values, not on optionals - FieldTypeContext now also contains reference to parent ContentTypeContext - recursion during document type scanning (exploding compounds)no longer affects the DocumentTypesService API - reduced duplication of recursion logic - - - - - fb490a64 by Tobias Jeger at 2016-11-13T15:24:55+01:00 CHANNELMGR-887 Improve FieldTypeUtils - relocated to more appropriate package - refactored for better scoping and readability - unit tests rewritten for good coverage - - - - - 4357b095 by Tobias Jeger at 2016-11-13T15:50:18+01:00 CHANNELMGR-887 Refactor awkward init signature - - - - - 9bda0bee by Tobias Jeger at 2016-11-13T23:11:50+01:00 CHANNELMGR-887 Fix displayName of children of CHOICE - refactor initialization of CHOICE field type for better readability / maintainability. - refactor initialization code for all FieldType classes. - - - - - cd20f98a by Tobias Jeger at 2016-11-14T13:43:58+01:00 CHANNELMGR-887 Remove unused code - - - - - e5ebd1eb by Tobias Jeger at 2016-11-14T13:44:52+01:00 CHANNELMGR-887 Remove unused code - - - - - b678c759 by Tobias Jeger at 2016-11-14T13:58:14+01:00 CHANNELMGR-887 Refactor DocumentTypesService so locale is no longer optional - - - - - f7d756d1 by Tobias Jeger at 2016-11-14T23:42:44+01:00 CHANNELMGR-887 Refactor ChoiceFieldType initialization - extract ChoiceFieldUtils - add unit tests for ChoiceFieldUtils - start unit tests for ChoiceFieldType (to be completed) - - - - - 57dcc802 by Tobias Jeger at 2016-11-15T11:25:17+01:00 CHANNELMGR-887 Add unit tests for reading a choice field - - - - - a5189115 by Tobias Jeger at 2016-11-15T13:02:04+01:00 CHANNELMGR-887 Improve naming of required-validation related method - - - - - a45e3f78 by Tobias Jeger at 2016-11-15T15:10:43+01:00 CHANNELMGR-887 Reduce duplicate code - - - - - 094e5343 by Mathijs den Burger at 2016-11-15T15:14:24+01:00 CHANNELMGR-922 Save changes before viewing doc in Content perspective - - - - - bd782a9e by Tobias Jeger at 2016-11-15T15:37:27+01:00 CHANNELMGR-887 Improve choice field utils - When a choice compound has no supported child fields, we used to *not* add it to the ChoiceFieldTypes list of choices. Upon writng the value of a choice field, this would trigger the deletion of the invalid choice node. By adding the empty compound to the list of valid choices, we make sure that these nodes dont get deleted inadvertently. - - - - - 1e7fa50b by Tobias Jeger at 2016-11-15T15:59:22+01:00 CHANNELMGR-887 Improve choice field type - improve terminology - store choices in a map for better accessibility - - - - - c24903e9 by Tobias Jeger at 2016-11-15T16:17:48+01:00 CHANNELMGR-887 Improve choice field type - store choices in a linked hash map to preserve the choice order - - - - - 110208a2 by Tobias Jeger at 2016-11-15T16:42:02+01:00 CHANNELMGR-887 Add missing unit tests - - - - - 73b85539 by Tobias Jeger at 2016-11-16T08:54:49+01:00 CHANNELMGR-993 remove one-time binding constraint for document value-related bindings - - - - - 57d53054 by Mathijs den Burger at 2016-11-16T09:46:36+01:00 CHANNELMGR-922 Refactoring after review - Dont suggest promise chaining of _closePanel and publish (_closePanel does not return a promise anyway because we dont want to wait until the panel is closed before switching) - Dont update the document / reset the form when switching since thats not necessary. - - - - - a404bd38 by Mathijs den Burger at 2016-11-16T10:21:55+01:00 CHANNELMGR-922 Clear document when right side-panel has been closed A closed sidenav is still present in the DOM, so clearing the document saves a lot of bindings in each digest cycle. ChannelSidePanelService.close() now returns a promise so we can clear the document when its no longer visible. - - - - - 888942a5 by Mathijs den Burger at 2016-11-16T10:22:27+01:00 CHANNELMGR-922 Reintegrate feature/visual-editing-psp1-CHANNELMGR-922 - - - - - 1a318c88 by Mark at 2016-11-16T10:27:24+01:00 CHANNELMGR-993 Merge branch feature/visual-editing-psp1
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANELLMGR-919
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANELLMGR-919 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-931
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-931 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-931] 2 commits: CHANNELMGR-931: is empty also trigger if there are no field values of the field i
Mark Lenser pushed to branch feature/visual-editing-psp1-CHANNELMGR-931 at
cms-community / hippo-addon-channel-manager
Commits:
14bd0f35 by Mark at 2016-10-28T12:21:12+02:00
CHANNELMGR-931: is empty also trigger if there are no field values of the field
id
- - - - -
f74e4da3 by Mark at 2016-10-28T12:21:44+02:00
CHANNELMGR-931: recursive call for compound fields
- - - - -
2 changed files:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
- frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
@@ -27,7 +27,7 @@ export class ChannelFieldsCtrl {
}
isEmptyMultiple(field) {
-return field.multiple && this.fieldValues[field.id].length === 0;
+return field.multiple && (!this.fieldValues[field.id] ||
this.fieldValues[field.id].length === 0);
}
isFieldFocused(field) {
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
=
--- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
+++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.html
@@ -33,8 +33,8 @@
ng-blur="$ctrl.onFieldBlur()">
-
-
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/18e324bf769d3b9e06e1ee470d76cd813732a6ad...f74e4da3837c91056ff86173ab8bceb4537aa893
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-931 tiny bit of margin for nested fields
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
abbb589a by Mark at 2016-11-04T10:35:45+01:00
CHANNELMGR-931 tiny bit of margin for nested fields
- - - - -
1 changed file:
- frontend-ng/src/styles/_forms.scss
Changes:
=
frontend-ng/src/styles/_forms.scss
=
--- a/frontend-ng/src/styles/_forms.scss
+++ b/frontend-ng/src/styles/_forms.scss
@@ -49,3 +49,10 @@ form {
}
}
}
+channel-fields {
+ channel-fields {
+md-input-container {
+ margin-left: 4px;
+}
+ }
+}
\ No newline at end of file
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/abbb589a1c6551a48928e845acbbd6381fc5a87e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-972
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-972 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] 2 commits: CHANNELMGR-972 remove for of to avoid ie11 issue
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
52256916 by Mark at 2016-11-04T11:53:34+01:00
CHANNELMGR-972 remove for of to avoid ie11 issue
- - - - -
8d5b1171 by Mark at 2016-11-04T12:09:59+01:00
CHANNELMGR-972 Merge branch feature/visual-editing-psp1 of
code.onehippo.org:cms-community/hippo-addon-channel-manager into
feature/visual-editing-psp1
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields.component.js
@@ -36,12 +36,12 @@ export class ChannelFieldsCtrl {
}
let hasFocused = field.fields.findIndex(newField => newField.focused) !==
-1;
-for (const newField of field.fields) {
+field.fields.forEach((newField) => {
const childFieldHasFocused = this.hasFocusedField(newField);
if (childFieldHasFocused) {
hasFocused = true;
}
-}
+});
return hasFocused;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/7c1c3a54de1d1869064ab67acf1f29e792f01e6c...8d5b11715742f6945a68a0cff7715a242bdbf9ce
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-972
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-972 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1] CHANNELMGR-974 fix label width for ie11 - it caused a horizontal scrollbar
Mark Lenser pushed to branch feature/visual-editing-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
c5e18cb3 by Mark at 2016-11-04T12:14:53+01:00
CHANNELMGR-974 fix label width for ie11 - it caused a horizontal scrollbar
- - - - -
1 changed file:
- frontend-ng/src/styles/_ie_hacks.scss
Changes:
=
frontend-ng/src/styles/_ie_hacks.scss
=
--- a/frontend-ng/src/styles/_ie_hacks.scss
+++ b/frontend-ng/src/styles/_ie_hacks.scss
@@ -24,5 +24,9 @@
.flex-no-grow-ie {
flex-grow: 0 !important;
}
-}
+ md-input-container label:not(.md-no-float):not(.md-container-ignore),
+ md-input-container .md-placeholder {
+width: auto;
+ }
+}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/c5e18cb331e4ccae1387363e3cc1f6c637cb24d9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-974
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-974 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-974
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-974 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/visual-editing-psp1-CHANNELMGR-931
Mark Lenser deleted branch feature/visual-editing-psp1-CHANNELMGR-931 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/visual-editing-psp1-CHANNELMGR-930
Mark Lenser pushed new branch feature/visual-editing-psp1-CHANNELMGR-930 at cms-community / hippo-addon-channel-manager ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
