[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/spaplus] HSTTWO-4227: removing unused class

[Woonsan Ko]

Woonsan Ko pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
e7d55bc7 by Woonsan Ko at 2018-03-26T16:17:20-04:00
HSTTWO-4227: removing unused class

- - - - -


1 changed file:

- − 
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/model/NodeSpan.java


Changes:

=
components/core/src/main/java/org/hippoecm/hst/core/pagemodel/model/NodeSpan.java
 deleted
=
--- 
a/components/core/src/main/java/org/hippoecm/hst/core/pagemodel/model/NodeSpan.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  Copyright 2018 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.
- */
-package org.hippoecm.hst.core.pagemodel.model;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import org.hippoecm.hst.util.HstResponseStateUtils;
-import org.w3c.dom.Comment;
-
-/**
- * Preamble/epilogue comment node representation model.
- */
-public class NodeSpan {
-
-private String type;
-private Comment comment;
-private String data;
-
-public NodeSpan(Comment comment) {
-type = "comment";
-this.comment = comment;
-}
-
-public String getType() {
-return type;
-}
-
-public String getData() throws IOException {
-if (data == null) {
-StringWriter sw = new StringWriter(256);
-HstResponseStateUtils.printComment(comment, sw);
-data = sw.toString();
-}
-
-return data;
-}
-
-}



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e7d55bc700e2256a9db34973a9be9c26c4f090b7

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/e7d55bc700e2256a9db34973a9be9c26c4f090b7
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1767] CHANNELMGR-1767 Use virtual repeat container in component catalog

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community / 
hippo-addon-channel-manager


Commits:
5439210d by Mathijs den Burger at 2018-03-26T21:09:46+02:00
CHANNELMGR-1767 Use virtual repeat container in component catalog

The md-1-line class per item gave a weird virtual scroller height while
md-2-line class works fine. Only the name of the components is smaller
now, but that actually looks quite good.

- - - - -


3 changed files:

- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss


Changes:

=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
@@ -22,26 +22,27 @@
 
 
 
-  
-
-  
+  
+
+  
+
 
-  
-
-  {{ $ctrl.getComponentLabel(component) }}
-
-  
+
+  
+{{ $ctrl.getComponentLabel(component) 
}}
+  
+
 
-  
-close
-  
-
-  
-
-  
+
+  close
+
+
+  
+
+  
 


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -16,6 +16,14 @@
 component-catalog {
   height: 100%;
 
+  > md-content {
+height: 100%;
+  }
+
+  .md-virtual-repeat-container {
+height: 100%;
+  }
+
   .md-avatar {
 border-radius: 0 !important;
   }


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/siteMapListing/siteMapListing.scss
@@ -21,7 +21,7 @@ site-map-listing {
 height: 100%;
   }
 
-  md-virtual-repeat-container {
+  .md-virtual-repeat-container {
 height: 100%;
   }
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5439210d93f79a18db6b8c6d91f80d1d0008c5ed

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5439210d93f79a18db6b8c6d91f80d1d0008c5ed
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1767] CHANNELMGR-1767 Move component catalog specific rules to its own scss

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community / 
hippo-addon-channel-manager


Commits:
22dd5cea by Mathijs den Burger at 2018-03-26T20:53:22+02:00
CHANNELMGR-1767 Move component catalog specific rules to its own scss

- - - - -


2 changed files:

- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss


Changes:

=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -15,4 +15,12 @@
  */
 component-catalog {
   height: 100%;
+
+  .md-avatar {
+border-radius: 0 !important;
+  }
+
+  .catalog-list-item-active {
+font-style: italic;
+  }
 }


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.scss
@@ -33,18 +33,10 @@ left-side-panel {
 padding: 0;
   }
 
-  .md-avatar {
-border-radius: 0 !important;
-  }
-
   .list-item-active {
 background-color: $list-item-active-bgcolor;
   }
 
-  .catalog-list-item-active {
-font-style: italic;
-  }
-
   // OpenSans fonts cut off at the 'g' with line-height 1.2 from Material
   .md-list-item-text h4 {
 line-height: 1.3em !important;



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/22dd5cea1e502db1036d4414208c57a09845caa2

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/22dd5cea1e502db1036d4414208c57a09845caa2
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1767] CHANNELMGR-1767 Add search to component catalog

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1767 at cms-community / 
hippo-addon-channel-manager


Commits:
e9a7b76d by Mathijs den Burger at 2018-03-26T17:32:05+02:00
CHANNELMGR-1767 Add search to component catalog

- - - - -


6 changed files:

- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
- 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
- + 
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
- frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
- frontend-ng/src/i18n/en.json


Changes:

=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.component.js
@@ -16,6 +16,7 @@
 
 import ComponentCatalogController from './componentCatalog.controller';
 import template from './componentCatalog.html';
+import './componentCatalog.scss';
 
 const componentCatalogComponent = {
   bindings: {


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.controller.js
@@ -22,6 +22,9 @@ class ComponentCatalogController {
 this.MaskService = MaskService;
 this.OverlayService = OverlayService;
 this.ComponentCatalogService = ComponentCatalogService;
+
+this.filteredFields = ['label'];
+this.filteredComponents = this.components;
   }
 
   _toggleState() {
@@ -31,6 +34,10 @@ class ComponentCatalogController {
 }
   }
 
+  onFilter(filteredComponents) {
+this.filteredComponents = filteredComponents;
+  }
+
   onSelect(component) {
 this._toggleState();
 this.ComponentCatalogService.selectComponent(component);


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
=
--- 
a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.html
@@ -13,27 +13,35 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-
-
-  
-
-
-
-  
-{{ $ctrl.getComponentLabel(component) }}
-  
-
-
-
-  close
-
-
-
-  
-
-
+
+
+
+
+  
+
+  
+
+  
+
+  {{ $ctrl.getComponentLabel(component) }}
+
+  
+
+  
+close
+  
+
+  
+
+  
+


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
=
--- /dev/null
+++ 
b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/componentCatalog/componentCatalog.scss
@@ -0,0 +1,18 @@
+/*!
+ * Copyright 2018 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.
+ */
+component-catalog {
+  height: 100%;
+}


=
frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
=
--- a/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
+++ b/frontend-ng/src/app/channel/sidePanels/leftSidePanel/leftSidePanel.html
@@ -24,10 +24,17 @@
md-no-pagination
class="qa-sidenav-tabs">
 
-  
+  
+  
 
 
-  
+  
+  
 
   
 


=
frontend-ng/src/i18n/en.json
=
--- a/frontend-ng/src/i18n/en.json
+++ b/frontend-ng/src/i18n/en.json
@@ -172,6 +172,8 @@
   "SAVE_CHANGES_GENERIC": "'{{documentName}}' has unsaved changes. Do you want 
to save or discard these changes?",
   "SAVE_CHANGES_ON_PUBLISH_MESSAGE": "'{{documentName}}' 

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Pushed new branch feature/CHANNELMGR-1769

[Arthur Bogaart]

Arthur Bogaart pushed new branch feature/CHANNELMGR-1769 at cms-community / 
hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1769
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1767

[Mathijs den Burger]

Mathijs den Burger pushed new branch feature/CHANNELMGR-1767 at cms-community / 
hippo-addon-channel-manager

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/tree/feature/CHANNELMGR-1767
You're receiving this email because of your account on code.onehippo.org.
___
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][master] CHANNELMGR-1391 make unit tests that check date parts more robust

[Bert Leunis]

Bert Leunis pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
1aaf888c by Bert Leunis at 2018-03-26T15:42:44+02:00
CHANNELMGR-1391 make unit tests that check date parts more robust

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
@@ -21,7 +21,7 @@ describe('DateValue', () => {
 
   describe('when populated', () => {
 beforeEach(() => {
-  dateValue = new DateValue('2018-03-12T12:01:50.041+01:00');
+  dateValue = new DateValue('2018-03-12T08:01:50.041+01:00');
 });
 
 it('contains data', () => {
@@ -48,26 +48,36 @@ describe('DateValue', () => {
 });
 
 it('does not change hours or minutes values when changing the date', () => 
{
+  const hoursBefore = dateValue.hours;
+  const minutesBefore = dateValue.minutes;
   const newDate = new Date(2017, 2, 2, 0, 0, 0, 0); // date with hours and 
minutes = 0
   dateValue.date = newDate;
-  expect(dateValue.hours).toBe(12);
-  expect(dateValue.minutes).toBe('01');
+  expect(dateValue.hours).toBe(hoursBefore);
+  expect(dateValue.minutes).toBe(minutesBefore);
 });
 
 it('does not change date or minutes values when changing the hours', () => 
{
+  const minutesBefore = dateValue.minutes;
+  const yearBefore = dateValue.date.getFullYear();
+  const monthBefore = dateValue.date.getMonth();
+  const dayBefore = dateValue.date.getDate();
   dateValue.hours = 3;
-  expect(dateValue.minutes).toBe('01');
-  expect(dateValue.date.getFullYear()).toBe(2018);
-  expect(dateValue.date.getMonth()).toBe(2); // month is zero based
-  expect(dateValue.date.getDate()).toBe(12);
+  expect(dateValue.minutes).toBe(minutesBefore);
+  expect(dateValue.date.getFullYear()).toBe(yearBefore);
+  expect(dateValue.date.getMonth()).toBe(monthBefore);
+  expect(dateValue.date.getDate()).toBe(dayBefore);
 });
 
 it('does not change date or hours values when changing the minutes', () => 
{
+  const hoursBefore = dateValue.hours;
+  const yearBefore = dateValue.date.getFullYear();
+  const monthBefore = dateValue.date.getMonth();
+  const dayBefore = dateValue.date.getDate();
   dateValue.minutes = 59;
-  expect(dateValue.hours).toBe(12);
-  expect(dateValue.date.getFullYear()).toBe(2018);
-  expect(dateValue.date.getMonth()).toBe(2); // month is zero based
-  expect(dateValue.date.getDate()).toBe(12);
+  expect(dateValue.hours).toBe(hoursBefore);
+  expect(dateValue.date.getFullYear()).toBe(yearBefore);
+  expect(dateValue.date.getMonth()).toBe(monthBefore);
+  expect(dateValue.date.getDate()).toBe(dayBefore);
 });
   });
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1aaf888c7a05f8000f9860766a597939e2be132d

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/1aaf888c7a05f8000f9860766a597939e2be132d
You're receiving this email because of your account on code.onehippo.org.
___
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][master] CHANNELMGR-1391 Fix license header

[Bert Leunis]

Bert Leunis pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
72fbe763 by Bert Leunis at 2018-03-26T14:13:35+02:00
CHANNELMGR-1391 Fix license header

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
@@ -5,7 +5,7 @@
  * 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.01
+ *  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,



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/72fbe763f80861451e61d258cd757f886c79df3c

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/72fbe763f80861451e61d258cd757f886c79df3c
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1391

[Bert Leunis]

Bert Leunis deleted branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager

---

You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1391] CHANNELMGR-1391 Fix lint warning errors

[Bert Leunis]

Bert Leunis pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
97158323 by Bert Leunis at 2018-03-26T13:42:45+02:00
CHANNELMGR-1391 Fix lint warning errors

Reported warnings, that consist of errors? Well!

- - - - -


2 changed files:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import DateValue from "./dateValue.model";
+import DateValue from './dateValue.model';
 
 describe('DateField', () => {
   let $componentController;
   let $ctrl;
   let ngModel;
 
-  const fieldType = {id: 'field:type'};
-  const fieldValue = {value: '2015-08-24T06:53:00.000Z'};
+  const fieldType = { id: 'field:type' };
+  const fieldValue = { value: '2015-08-24T06:53:00.000Z' };
 
   beforeEach(() => {
 angular.mock.module('hippo-cm');


=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import DateValue from "./dateValue.model";
+import DateValue from './dateValue.model';
 
 describe('DateValue', () => {
   let dateValue;
@@ -168,5 +168,4 @@ describe('DateValue', () => {
   expect(dateValue.date).not.toBe(null);
 });
   });
-
-});
\ No newline at end of file
+});



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/97158323f18d79c731f14e189c9758f916e86aff

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/97158323f18d79c731f14e189c9758f916e86aff
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1391] 52 commits: CHANNELMGR-1744 Add documentation module

[Bert Leunis]

Bert Leunis pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
96ae24e2 by Mathijs den Burger at 2018-03-06T16:43:49+01:00
CHANNELMGR-1744 Add documentation module

Text is written in markdown, figures are generated via PlantUML.

Created the initial version of channel-manager-guidebook.md with two
C4 diagrams: a context diagram that sketches the Channel Manager and the
high-level entities is interacts with, and a container diagram that
zooms in on the Channel Manager block of the context diagram.

Also includes an initial functional breakdown of the Channel Manager.

- - - - -
4e6547f9 by Mathijs den Burger at 2018-03-08T14:08:46+01:00
CHANNELMGR-1744 Fix ID of repository box in context diagram

- - - - -
09db9331 by Mathijs den Burger at 2018-03-09T17:51:59+01:00
CHANNELMGR-1744 Add generated diagrams and generation code

The code currently runs as a disabled unit test. Output should be
grepped, filtered and piped to a file:

  npm run testOnce -- --cache | grep DUMP | sed 
s/^.*\(.*\).*$/\1/  file.txt

- - - - -
692ac2be by Mathijs den Burger at 2018-03-12T12:42:50+01:00
CHANNELMGR-1744 Only use name of injectables in generation code

- - - - -
a36957fb by Mathijs den Burger at 2018-03-12T12:43:28+01:00
CHANNELMGR-1744 Add diagram of all shared injectables

- - - - -
0de12470 by Bert Leunis at 2018-03-15T14:32:36+01:00
CHANNELMGR-1765 move left side toggle button styling into its own scss file

- - - - -
0499ebdc by Bert Leunis at 2018-03-15T14:34:21+01:00
CHANNELMGR-1765 add styling to position resize handle left and right in a panel

- - - - -
7e424699 by Mathijs den Burger at 2018-03-19T09:22:39+01:00
CHANNELMGR-1744 Add Alter Ego dialog

- - - - -
3e765527 by Mathijs den Burger at 2018-03-19T12:08:08+01:00
CHANNELMGR-1744 Expand functional description

- - - - -
c8956c5b by Mathijs den Burger at 2018-03-19T12:08:53+01:00
CHANNELMGR-1744 Increase size of container diagram

Makes the text in boxes easier to read.

- - - - -
33189e77 by Mathijs den Burger at 2018-03-19T12:37:38+01:00
CHANNELMGR-1744 Switch to SVG diagrams, expand text some more

- - - - -
6d876188 by Mathijs den Burger at 2018-03-19T12:37:59+01:00
CHANNELMGR-1744 Add small README for documentation module

- - - - -
9909e158 by Mathijs den Burger at 2018-03-19T12:38:38+01:00
CHANNELMGR-1744 Delete generated detail diagrams

- - - - -
adce3024 by Bert Leunis at 2018-03-20T13:47:48+01:00
CHANNELMGR-1765 resize handle component can place the handle at the left or 
right of a panel

Also the min-width is not hard coded any more and can be added as attribute.

- - - - -
40a950d4 by Bert Leunis at 2018-03-20T13:50:56+01:00
CHANNELMGR-1765 move the resize handle component code to its new proper 
location location in the structure

- - - - -
b49bb0e1 by Mathijs den Burger at 2018-03-20T17:27:03+01:00
CHANNELMGR-1744 Only generate PlantUML diagrams when Graphviz is present

- - - - -
d0a58efc by Arthur Bogaart at 2018-03-20T23:35:58+01:00
CHANNELMGR-1756 Add siteMapListing component

Move siteMapListing code from leftSidePanel into new
SiteMapListingComponent.

- - - - -
00b0d0b6 by Arthur Bogaart at 2018-03-20T23:36:17+01:00
CHANNELMGR-1756 Add search and virtual-repeat

- - - - -
0b751338 by Mathijs den Burger at 2018-03-21T13:53:41+01:00
CHANNELMGR-1744 Remove unit tests that generate PlantUML diagrams

We wont generate diagrams of this level of detail as part of the
build, at least not for now.

- - - - -
83498708 by Mathijs den Burger at 2018-03-21T15:40:18+01:00
CHANNELMGR-1756 Merge master changes

- - - - -
91e13d76 by Mathijs den Burger at 2018-03-21T18:17:03+01:00
CHANNELMGR-1756 Improve variable names

- list -- items (multiple things sounds more logical)
- query -- keywords (in line with the controller)
- internal query - terms (in line with Lucene)
- needle -- term (in line with terms)

- - - - -
0e5f82e5 by Mathijs den Burger at 2018-03-21T21:20:46+01:00
CHANNELMGR-1756 Relax assumptions on input

- assume fields is always an Array instead of stringifying a non-array
- assume non-string fields never match instead of stringifying them

- - - - -
66c03d6a by Mathijs den Burger at 2018-03-21T21:25:14+01:00
CHANNELMGR-1756 Rename siteMapListingFilter to searchFilter

Seems a more logical name since its so generic.

- - - - -
1bcf9af6 by Mathijs den Burger at 2018-03-21T21:33:16+01:00
CHANNELMGR-1756 Remove empty terms before searching

More than one space between terms results in empty terms when splitting
on spaces. Looping over these empty terms is unnecessary since they will
never match, so filter them out beforehand.

- - - - -
4c6a50bf by Mathijs den Burger at 2018-03-21T21:35:02+01:00
CHANNELMGR-1756 Also search in the pageTitle of site map items

The list renders either the pageTitle or (if missing) the name property,
so search both.

- - - - -
6b9774b3 by Mathijs den Burger at 2018-03-21T21:59:02+01:00
CHANNELMGR-1756 Add unit tests for search filter

- - - - -
ac7573e2 by 

[HippoCMS-scm] [onehippo/ckeditor]

[GitHub]

  Branch: refs/heads/bugfix/RD-4242
  Home:   https://github.com/onehippo/ckeditor
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] a19b83: RD-4242 Support node 8

[GitHub]

  Branch: refs/heads/hippo/release/12.1
  Home:   https://github.com/onehippo/ckeditor
  Commit: a19b8328478343c1bb9d3908c1158ea2a58c09fb
  
https://github.com/onehippo/ckeditor/commit/a19b8328478343c1bb9d3908c1158ea2a58c09fb
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
M package.json

  Log Message:
  ---
  RD-4242 Support node 8

The codemirror plugin "required" node 6, but node 8 also works fine.
Fixed this in a custom tag (1.16.2), no code changes.

(cherry picked from commit 65760af5c56952aac8fb1480691ed43931b91b2f)


  Commit: 3be248f8cd0da170549c210f85dea8be28eabd20
  
https://github.com/onehippo/ckeditor/commit/3be248f8cd0da170549c210f85dea8be28eabd20
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
A package-lock.json
M package.json

  Log Message:
  ---
  RD-4242 Support node 8

Our forks of the textselection plugin and wordcount plugin also added a
requirement on node 6. These requirements have been bumped to node 8.

(cherry picked from commit 6a019d91469b7ec749f75dcc1822b1289526070a)


  Commit: c7ecda0cf0b9210dd8ed16a442428fc505283473
  
https://github.com/onehippo/ckeditor/commit/c7ecda0cf0b9210dd8ed16a442428fc505283473
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
M package.json

  Log Message:
  ---
  RD-4242 Require node >=8 and npm >= 5

(cherry picked from commit 93941af39f02b2e5b503999b79f1d45bb0b34774)


  Commit: f9e8567440d9bf1c0520f128152b1cdf2dc8ec65
  
https://github.com/onehippo/ckeditor/commit/f9e8567440d9bf1c0520f128152b1cdf2dc8ec65
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
A package-lock.json
M package.json

  Log Message:
  ---
  RD-4242 Reintegrate bugfix/RD-4242


Compare: 
https://github.com/onehippo/ckeditor/compare/393c946ce478...f9e8567440d9___
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/CHANNELMGR-1391] CHANNELMGR-1391 add unit tests that check that a change on a time value does not…

[Bert Leunis]

Bert Leunis pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
44609e97 by Bert Leunis at 2018-03-26T13:30:37+02:00
CHANNELMGR-1391 add unit tests that check that a change on a time value does 
not update the other values

The three input fields should only change and their corresponding values and 
have no effect on the other values.

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateValue.model.spec.js
@@ -47,12 +47,28 @@ describe('DateValue', () => {
   expect(dateValue.hours).toBe(23);
 });
 
-it('when a new date is set, existing hours and minutes are maintained', () 
=> {
+it('does not change hours or minutes values when changing the date', () => 
{
   const newDate = new Date(2017, 2, 2, 0, 0, 0, 0); // date with hours and 
minutes = 0
   dateValue.date = newDate;
   expect(dateValue.hours).toBe(12);
   expect(dateValue.minutes).toBe('01');
 });
+
+it('does not change date or minutes values when changing the hours', () => 
{
+  dateValue.hours = 3;
+  expect(dateValue.minutes).toBe('01');
+  expect(dateValue.date.getFullYear()).toBe(2018);
+  expect(dateValue.date.getMonth()).toBe(2); // month is zero based
+  expect(dateValue.date.getDate()).toBe(12);
+});
+
+it('does not change date or hours values when changing the minutes', () => 
{
+  dateValue.minutes = 59;
+  expect(dateValue.hours).toBe(12);
+  expect(dateValue.date.getFullYear()).toBe(2018);
+  expect(dateValue.date.getMonth()).toBe(2); // month is zero based
+  expect(dateValue.date.getDate()).toBe(12);
+});
   });
 
   describe('when populated with time zone', () => {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/44609e975f4e8b76dbf6938a06b4c4a93920c366

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/44609e975f4e8b76dbf6938a06b4c4a93920c366
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1391] CHANNELMGR-1391 apply left aligning of date label also when field is invalid or has focus

[Bert Leunis]

Bert Leunis pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
e76cefcb by Bert Leunis at 2018-03-26T13:19:58+02:00
CHANNELMGR-1391 apply left aligning of date label also when field is invalid or 
has focus

There is only one case where no left-align is needed, that is when the field 
has no focus and no value. Then the label sinks down into the field (18px to 
the right, in the field not overlapping the calendar icon) as is usual in 
material design.

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.scss
@@ -15,11 +15,16 @@
  */
 @import 'variables';
 
-// left-align labels of date fields
-.md-input-focused._md-datepicker-floating-label._md-datepicker-has-calendar-icon
 > label:not(.md-no-float):not(.md-container-ignore) {
-  left: 0;
-  right: auto;
-  width: 100%;
+// left-align labels of date fields when focused, invalid, but when there is 
no value, the label sinks down on the field
+._md-datepicker-floating-label._md-datepicker-has-calendar-icon {
+  &.md-input-focused,
+  &.md-input-has-value {
+> label:not(.md-no-float):not(.md-container-ignore) {
+  left: 0;
+  right: auto;
+  width: 100%;
+}
+  }
 }
 
 date-field {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e76cefcb5b1ecfdd11e50e7d526184ad297d0f7c

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/e76cefcb5b1ecfdd11e50e7d526184ad297d0f7c
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][feature/spaplus] HSTTWO-4290 Make sure that the SpaSitePipeline does not render html comments

[Ard Schrijvers]

Ard Schrijvers pushed to branch feature/spaplus at cms-community / 
hippo-site-toolkit


Commits:
9f277bae by Ard Schrijvers at 2018-03-26T12:52:13+02:00
HSTTWO-4290 Make sure that the SpaSitePipeline does not render html comments

The html comments should not be rendered by the SpaSitePipeline but
injected by the SPA. I did this change in the 
SelectiveRenderingAggregationValve,
which is debatable because perhaps only in SpaSitePipeline we should
skip comments. However, for SelectiveRenderingAggregationValve I at this
moment see no point in ever rendering the comments (meant for the CM
to function)

- - - - -


4 changed files:

- api/src/main/java/org/hippoecm/hst/core/component/HstResponseState.java
- 
commons/src/main/java/org/hippoecm/hst/core/component/HstServletResponseState.java
- + 
components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingAggregationValve.java
- 
components/core/src/main/resources/org/hippoecm/hst/site/container/SpringComponentManager-pipelines.xml


Changes:

=
api/src/main/java/org/hippoecm/hst/core/component/HstResponseState.java
=
--- a/api/src/main/java/org/hippoecm/hst/core/component/HstResponseState.java
+++ b/api/src/main/java/org/hippoecm/hst/core/component/HstResponseState.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-2018 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.
@@ -136,7 +136,7 @@ public interface HstResponseState
 
 void addProcessedHeadElement(Element headElement);
 
-public void addPreambleNode(Comment comment);
+void addPreambleNode(Comment comment);
 
 /**
  * Preamble {@link org.w3c.dom.Node}s are written before the rest of the 
content of this {@link HstResponseState}. Note that
@@ -144,7 +144,7 @@ public interface HstResponseState
  * any descendant @link org.w3c.dom.Node}s of element
  * @param element the element that is a preamble
  */
-public void addPreambleNode(Element element);
+void addPreambleNode(Element element);
 
 /**
  * Return unmodifiable preamble {@link org.w3c.dom.Node}s.
@@ -152,6 +152,11 @@ public interface HstResponseState
  */
 List getPreambleNodes();
 
+/**
+ * clears the currently available preamble nodes on the {@link 
HstResponseState}
+ */
+void clearPreambleComments();
+
 void addEpilogueNode(Comment comment);
 
 /**
@@ -160,6 +165,11 @@ public interface HstResponseState
  */
 List getEpilogueNodes();
 
+/**
+ * clears the currently available epilogue nodes on the {@link 
HstResponseState}
+ */
+void clearEpilogueComments();
+
 void setWrapperElement(Element element);
 
 Element getWrapperElement();


=
commons/src/main/java/org/hippoecm/hst/core/component/HstServletResponseState.java
=
--- 
a/commons/src/main/java/org/hippoecm/hst/core/component/HstServletResponseState.java
+++ 
b/commons/src/main/java/org/hippoecm/hst/core/component/HstServletResponseState.java
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ *  Copyright 2008-2018 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.
@@ -732,6 +732,22 @@ public class HstServletResponseState implements 
HstResponseState {
 return Collections.unmodifiableList(preambleNodes);
 }
 
+@Override
+public void clearPreambleComments() {
+if (preambleComments == null) {
+return;
+}
+preambleComments.clear();
+}
+
+@Override
+public void clearEpilogueComments() {
+if (epilogueComments == null) {
+return;
+}
+epilogueComments.clear();
+}
+
 public void addEpilogueNode(Comment comment) {
 if (epilogueComments == null) {
 epilogueComments = new ArrayList<>();


=
components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingAggregationValve.java
=
--- /dev/null
+++ 
b/components/core/src/main/java/org/hippoecm/hst/core/container/SelectiveRenderingAggregationValve.java
@@ -0,0 +1,48 @@
+/*
+ *  Copyright 2018 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,
+ *  

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] CHANNELMGR-1391 Add tests for $mdDateLocale and moment.js initialization

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
95bf4b83 by Mathijs den Burger at 2018-03-26T12:51:10+02:00
CHANNELMGR-1391 Add tests for $mdDateLocale and moment.js initialization

- - - - -


1 changed file:

- frontend-ng/src/app/hippo-cm.spec.js


Changes:

=
frontend-ng/src/app/hippo-cm.spec.js
=
--- a/frontend-ng/src/app/hippo-cm.spec.js
+++ b/frontend-ng/src/app/hippo-cm.spec.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2018 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.
@@ -16,11 +16,13 @@
 
 import angular from 'angular';
 import 'angular-mocks';
+import moment from 'moment-timezone';
 
 describe('The hippo-cm module', () => {
   let configService;
   let $http;
   let $httpBackend;
+  let $injector;
   let $rootScope;
   let $state;
   let $translate;
@@ -42,10 +44,11 @@ describe('The hippo-cm module', () => {
   $translateProvider.translations('nl', MOCK_TRANSLATIONS.nl);
 });
 
-inject((ConfigService, _$http_, _$httpBackend_, _$rootScope_, _$state_, 
_$translate_, _$window_) => {
+inject((ConfigService, _$http_, _$httpBackend_, _$injector_, _$rootScope_, 
_$state_, _$translate_, _$window_) => {
   configService = ConfigService;
   $http = _$http_;
   $httpBackend = _$httpBackend_;
+  $injector = _$injector_;
   $rootScope = _$rootScope_;
   $state = _$state_;
   $translate = _$translate_;
@@ -88,4 +91,76 @@ describe('The hippo-cm module', () => {
 $httpBackend.flush();
 expect($window.APP_TO_CMS.publish).toHaveBeenCalledWith('user-activity');
   });
+
+  it('uses the user locale for moment.js', () => {
+configService.locale = 'nl';
+$state.go('hippo-cm.dummy-child-state');
+$rootScope.$apply();
+
+expect(moment.locale()).toEqual('nl');
+  });
+
+  describe('Angular Material Date Locale Provider', () => {
+it('uses an empty string for invalid dates', () => {
+  const $mdDateLocale = $injector.get('$mdDateLocale');
+  const invalidDate = new Date('2015-13-25T35:78:89.000Z');
+  expect($mdDateLocale.formatDate(invalidDate)).toEqual('');
+});
+
+describe('with a Dutch user locale', () => {
+  let $mdDateLocale;
+
+  beforeEach(() => {
+configService.locale = 'nl';
+$state.go('hippo-cm.dummy-child-state');
+$rootScope.$apply();
+
+// fetch $mdDateLocale after setting the locale so it uses the tweaks 
in the $mdDateLocaleProvider
+$mdDateLocale = $injector.get('$mdDateLocale');
+  });
+
+  it('uses locale-specific month names', () => {
+expect($mdDateLocale.months).toEqual(['januari', 'februari', 'maart', 
'april', 'mei', 'juni', 'juli', 'augustus', 'september', 'oktober', 'november', 
'december']);
+  });
+
+  it('uses locale-specific short month names', () => {
+expect($mdDateLocale.shortMonths).toEqual(['jan.', 'feb.', 'mrt.', 
'apr.', 'mei', 'jun.', 'jul.', 'aug.', 'sep.', 'okt.', 'nov.', 'dec.']);
+  });
+
+  it('uses locale-specific day names', () => {
+expect($mdDateLocale.days).toEqual(['maandag', 'dinsdag', 'woensdag', 
'donderdag', 'vrijdag', 'zaterdag', 'zondag']);
+  });
+
+  it('uses locale-specific short day names', () => {
+expect($mdDateLocale.shortDays).toEqual(['ma', 'di', 'wo', 'do', 'vr', 
'za', 'zo']);
+  });
+
+  it('formats dates in the user locale', () => {
+const christmas = new Date('2015-12-25T06:53:00.000Z');
+expect($mdDateLocale.formatDate(christmas)).toEqual('25-12-2015');
+  });
+});
+
+describe('without a locale', () => {
+  let $mdDateLocale;
+
+  beforeEach(() => {
+configService.locale = null;
+$state.go('hippo-cm.dummy-child-state');
+$rootScope.$apply();
+
+// fetch $mdDateLocale after setting the locale so it uses the tweaks 
in the $mdDateLocaleProvider
+$mdDateLocale = $injector.get('$mdDateLocale');
+  });
+
+  it('falls back to English', () => {
+expect(moment.locale()).toEqual('en');
+  });
+
+  it('formats dates in the English locale', () => {
+const christmas = new Date('2015-12-25T06:53:00.000Z');
+expect($mdDateLocale.formatDate(christmas)).toEqual('12/25/2015');
+  });
+});
+  });
 });



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/95bf4b83484cfd2f1da0210da7e5b59ca580a4e9

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/95bf4b83484cfd2f1da0210da7e5b59ca580a4e9
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn 

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1391] CHANNELMGR-1391 Read time zone from user session instead of a cookie

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
a172ae57 by Mathijs den Burger at 2018-03-26T11:10:50+02:00
CHANNELMGR-1391 Read time zone from user session instead of a cookie

The DefaultLoginPlugin puts the selected time zone in the server-side
user session as well as in a cookie. The cookie is used to re-select
a previously selected time zone in the login page, but was now also used
to initialize the time zone in the Channel Manager. Thats an unexpected
side channel between modules that should be avoided.

- - - - -


5 changed files:

- frontend-ng/package-lock.json
- frontend-ng/package.json
- frontend-ng/src/app/hippo-cm.js
- frontend-ng/src/app/services/config.service.js
- 
frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java


Changes:

=
frontend-ng/package-lock.json
=
--- a/frontend-ng/package-lock.json
+++ b/frontend-ng/package-lock.json
@@ -371,11 +371,6 @@
   "resolved": 
"https://registry.npmjs.org/angular-aria/-/angular-aria-1.5.11.tgz;,
   "integrity": "sha1-JpY6wzaJHO17GZ5Zr9fpsl5T1qY="
 },
-"angular-cookies": {
-  "version": "1.5.11",
-  "resolved": 
"https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.5.11.tgz;,
-  "integrity": "sha1-iFWN58UETcw6vreWFNfvgQe6ScA="
-},
 "angular-local-storage": {
   "version": "0.7.1",
   "resolved": 
"https://registry.npmjs.org/angular-local-storage/-/angular-local-storage-0.7.1.tgz;,


=
frontend-ng/package.json
=
--- a/frontend-ng/package.json
+++ b/frontend-ng/package.json
@@ -28,7 +28,6 @@
 "angular": "1.5.11",
 "angular-animate": "1.5.11",
 "angular-aria": "1.5.11",
-"angular-cookies": "1.5.11",
 "angular-local-storage": "0.7.1",
 "angular-material": "1.1.5",
 "angular-messages": "1.5.11",


=
frontend-ng/src/app/hippo-cm.js
=
--- a/frontend-ng/src/app/hippo-cm.js
+++ b/frontend-ng/src/app/hippo-cm.js
@@ -16,7 +16,6 @@
 
 import angular from 'angular';
 import ngAnimate from 'angular-animate';
-import ngCookies from 'angular-cookies';
 import ngDeviceDetector from 'ng-device-detector';
 import ngLocalStorage from 'angular-local-storage';
 import ngMaterial from 'angular-material';
@@ -59,7 +58,6 @@ import run from './hippo-cm.run';
 const hippoCmng = angular
   .module('hippo-cm', [
 ngAnimate,
-ngCookies,
 ngDeviceDetector,
 ngLocalStorage,
 ngMaterial,


=
frontend-ng/src/app/services/config.service.js
=
--- a/frontend-ng/src/app/services/config.service.js
+++ b/frontend-ng/src/app/services/config.service.js
@@ -15,13 +15,12 @@
  */
 
 class ConfigService {
-  constructor($cookies, $window, CmsService) {
+  constructor($window, CmsService) {
 'ngInject';
 
 this.$window = $window;
 
 this.locale = 'en';
-this.timeZone = $cookies.get('tzcookie');
 this.rootUuid = 'cafebabe-cafe-babe-cafe-babecafebabe';
 this.contextPaths = ['/site'];
 


=
frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
=
--- 
a/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
+++ 
b/frontend/src/main/java/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.java
@@ -70,6 +70,10 @@ public class ChannelEditor extends ExtPanel {
 
 @ExtProperty
 @SuppressWarnings("unused")
+private String timeZone;
+
+@ExtProperty
+@SuppressWarnings("unused")
 private String apiUrlPrefix;
 
 @ExtProperty
@@ -122,8 +126,13 @@ public class ChannelEditor extends ExtPanel {
 this.apiUrlPrefix = apiUrlPrefix;
 this.contextPaths = contextPaths;
 this.locale = Session.get().getLocale().toString();
+
+final UserSession userSession = UserSession.get();
+this.timeZone = 
userSession.getClientInfo().getProperties().getTimeZone().getID();
+this.cmsUser = userSession.getJcrSession().getUserID();
+
 this.debug = 
Application.get().getDebugSettings().isAjaxDebugModeEnabled();
-this.cmsUser = UserSession.get().getJcrSession().getUserID();
+
 this.ckeditorUrl = 
CKEditorConstants.getCKEditorJsReference().getUrl().toString();
 this.ckeditorTimestamp = CKEditorConstants.CKEDITOR_TIMESTAMP;
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a172ae57c3dcee9a417d755ae59d4193701d4f81

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/a172ae57c3dcee9a417d755ae59d4193701d4f81
You're receiving this email because of your account on code.onehippo.org.

[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch bugfix/CHANNELMGR-1778

[Arthur Bogaart]

Arthur Bogaart deleted branch bugfix/CHANNELMGR-1778 at cms-community / 
hippo-addon-channel-manager

---

You're receiving this email because of your account on code.onehippo.org.
___
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][release/5.2] CHANNELMGR-1778 Use documentType + locale as cacheKey for documentTypes

[Arthur Bogaart]

Arthur Bogaart pushed to branch release/5.2 at cms-community / 
hippo-addon-channel-manager


Commits:
06bfa682 by Arthur Bogaart at 2018-03-23T16:27:48+01:00
CHANNELMGR-1778 Use documentType + locale as cacheKey for documentTypes

(cherry picked from commit 034302343c07d9964504624e3cfef1330a1c8e88)

- - - - -


1 changed file:

- 
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImpl.java


Changes:

=
content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImpl.java
=
--- 
a/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImpl.java
+++ 
b/content-service/src/main/java/org/onehippo/cms/channelmanager/content/documenttype/DocumentTypesServiceImpl.java
@@ -52,8 +52,10 @@ class DocumentTypesServiceImpl implements 
DocumentTypesService {
 @Override
 public DocumentType getDocumentType(final String id, final Session 
userSession, final Locale locale)
 throws ErrorWithPayloadException {
+
+final String cacheKey = id + "-" + locale.toString();
 try {
-return DOCUMENT_TYPES.get(id, () -> createDocumentType(id, 
userSession, locale));
+return DOCUMENT_TYPES.get(cacheKey, () -> createDocumentType(id, 
userSession, locale));
 } catch (final ExecutionException ignore) {
 throw new NotFoundException();
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/06bfa68230419cb1f3a785221c0c715820f4c5d1

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/06bfa68230419cb1f3a785221c0c715820f4c5d1
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor] a19b83: RD-4242 Support node 8

[GitHub]

  Branch: refs/heads/bugfix/RD-4242
  Home:   https://github.com/onehippo/ckeditor
  Commit: a19b8328478343c1bb9d3908c1158ea2a58c09fb
  
https://github.com/onehippo/ckeditor/commit/a19b8328478343c1bb9d3908c1158ea2a58c09fb
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
M package.json

  Log Message:
  ---
  RD-4242 Support node 8

The codemirror plugin "required" node 6, but node 8 also works fine.
Fixed this in a custom tag (1.16.2), no code changes.

(cherry picked from commit 65760af5c56952aac8fb1480691ed43931b91b2f)


  Commit: 3be248f8cd0da170549c210f85dea8be28eabd20
  
https://github.com/onehippo/ckeditor/commit/3be248f8cd0da170549c210f85dea8be28eabd20
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
A package-lock.json
M package.json

  Log Message:
  ---
  RD-4242 Support node 8

Our forks of the textselection plugin and wordcount plugin also added a
requirement on node 6. These requirements have been bumped to node 8.

(cherry picked from commit 6a019d91469b7ec749f75dcc1822b1289526070a)


  Commit: c7ecda0cf0b9210dd8ed16a442428fc505283473
  
https://github.com/onehippo/ckeditor/commit/c7ecda0cf0b9210dd8ed16a442428fc505283473
  Author: Mathijs den Burger 
  Date:   2018-03-26 (Mon, 26 Mar 2018)

  Changed paths:
M package.json

  Log Message:
  ---
  RD-4242 Require node >=8 and npm >= 5

(cherry picked from commit 93941af39f02b2e5b503999b79f1d45bb0b34774)


Compare: 
https://github.com/onehippo/ckeditor/compare/393c946ce478...c7ecda0cf0b9___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [onehippo/ckeditor]

[GitHub]

  Branch: refs/heads/bugfix/RD-4242
  Home:   https://github.com/onehippo/ckeditor
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/msdts] ESSENTIALS-1179 Exclude unsupported plugins

[Sergey Shepelevich]

Sergey Shepelevich pushed to branch feature/msdts at cms-community / 
hippo-essentials


Commits:
1ed3c37f by Sergey Shepelevich at 2018-03-26T10:32:49+02:00
ESSENTIALS-1179 Exclude unsupported plugins

- - - - -


1 changed file:

- dashboard-dependencies/pom.xml


Changes:

=
dashboard-dependencies/pom.xml
=
--- a/dashboard-dependencies/pom.xml
+++ b/dashboard-dependencies/pom.xml
@@ -103,19 +103,34 @@
 
 
   org.onehippo.cms7
-  hippo-essentials-plugin-poll
-  ${project.version}
-
-
-  org.onehippo.cms7
   hippo-essentials-plugin-related-documents
   ${project.version}
 
-
-  org.onehippo.cms7
-  hippo-essentials-plugin-robots
-  ${project.version}
-
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+
+  
+  
+  
+
 
   org.onehippo.cms7
   hippo-essentials-plugin-search
@@ -123,26 +138,11 @@
 
 
   org.onehippo.cms7
-  hippo-essentials-plugin-seo
-  ${project.version}
-
-
-  org.onehippo.cms7
-  hippo-essentials-plugin-sitemap
-  ${project.version}
-
-
-  org.onehippo.cms7
   hippo-essentials-plugin-simple-content
   ${project.version}
 
 
   org.onehippo.cms7
-  hippo-essentials-plugin-taxonomy
-  ${project.version}
-
-
-  org.onehippo.cms7
   hippo-essentials-plugin-urlrewriter
   ${project.version}
 



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/1ed3c37fd0064dfedb09ff2fb9a99786339d1dbd

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-essentials/commit/1ed3c37fd0064dfedb09ff2fb9a99786339d1dbd
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1391] 4 commits: CHANNELMGR-1391 Fix lint error

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
2cb082de by Mathijs den Burger at 2018-03-26T10:00:14+02:00
CHANNELMGR-1391 Fix lint error

- - - - -
fe09d1d0 by Mathijs den Burger at 2018-03-26T10:12:57+02:00
CHANNELMGR-1391 Improve name of _checkInit method

- - - - -
fe0e8832 by Mathijs den Burger at 2018-03-26T10:24:40+02:00
CHANNELMGR-1391 Simplify check for hours higher than 23

If hours is null, the comparison is also false.

- - - - -
20c4fcf9 by Mathijs den Burger at 2018-03-26T10:25:25+02:00
CHANNELMGR-1391 Polish unit test

- reuse field value in expected old date
- capitalize names

- - - - -


2 changed files:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
@@ -43,7 +43,7 @@ export class DateValue {
 this._initJsDate();
   }
 
-  _initJsDate () {
+  _initJsDate() {
 // use only the year, month and day of the moment and ignore the time and 
time zone
 this.jsDate = new Date(this.moment.format('L'));
   }
@@ -53,7 +53,7 @@ export class DateValue {
 this.jsDate = null;
   }
 
-  _checkInit() {
+  _initIfNeeded() {
 if (this.moment === null) {
   this._init(moment());
 }
@@ -64,8 +64,8 @@ export class DateValue {
   }
 
   set hours(hours) {
-const checkedHours = (hours && hours > 23) ? 23 : hours;
-this._checkInit();
+const checkedHours = hours > 23 ? 23 : hours;
+this._initIfNeeded();
 this.moment.hours(checkedHours);
   }
 
@@ -84,7 +84,7 @@ export class DateValue {
   }
 
   set minutes(minutes) {
-this._checkInit();
+this._initIfNeeded();
 this.moment.minutes(minutes);
   }
 
@@ -94,7 +94,7 @@ export class DateValue {
 
   set date(date) {
 if (date) {
-  this._checkInit();
+  this._initIfNeeded();
   this.moment.year(date.getFullYear());
   this.moment.month(date.getMonth());
   this.moment.date(date.getDate()); // day of the month


=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.spec.js
@@ -63,7 +63,7 @@ describe('DateField', () => {
 
   it('sets the value of a date to the current date and time when set to now is 
called', () => {
 spyOn($ctrl, 'valueChanged');
-const oldValue = new DateValue('2015-08-24T06:53:00.000Z');
+const oldValue = new DateValue(fieldValue.value);
 $ctrl.dateValue = new DateValue('2015-08-24T06:53:00.000Z');
 
 $ctrl.setToNow();
@@ -117,8 +117,8 @@ describe('DateValue', () => {
 // methods. The fields for the hours and minutes part of the date are 
using their own getter/setters.
 
 it('shows the day of the month correctly across the dateline', () => {
-  // in Amsterdam this is january 1 in 2019 at 0:30 (am)
-  // in Londen this is december 31 in 2018 at 23:30
+  // in Amsterdam this is January 1 in 2019 at 0:30 (am)
+  // in London this is December 31 in 2018 at 23:30
   const dateString = '2019-01-01T00:30:00.000+01:00';
 
   dateValue = new DateValue(dateString, 'Europe/London');
@@ -129,8 +129,8 @@ describe('DateValue', () => {
 });
 
 it('shows the month correctly across the dateline', () => {
-  // in Amsterdam this is january 1 in 2019 at 0:30 (am)
-  // in Londen this is december 31 in 2018 at 23:30
+  // in Amsterdam this is January 1 in 2019 at 0:30 (am)
+  // in London this is December 31 in 2018 at 23:30
   const dateString = '2019-01-01T00:30:00.000+01:00';
 
   dateValue = new DateValue(dateString, 'Europe/London');
@@ -141,8 +141,8 @@ describe('DateValue', () => {
 });
 
 it('shows the year correctly across the dateline', () => {
-  // in Amsterdam this is january 1 in 2019 at 0:30 (am)
-  // in Londen this is december 31 in 2018 at 23:30
+  // in Amsterdam this is January 1 in 2019 at 0:30 (am)
+  // in London this is December 31 in 2018 at 23:30
   const dateString = '2019-01-01T00:30:00.000+01:00';
 
   dateValue = new DateValue(dateString, 'Europe/London');
@@ -153,8 +153,8 @@ describe('DateValue', () => {
 });
 
 it('shows the hours correctly 

[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/tobi-essentials-content-update

[Peter Centgraf]

Peter Centgraf pushed new branch bugfix/tobi-essentials-content-update at 
cms-community / hippo-repository

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-repository/tree/bugfix/tobi-essentials-content-update
You're receiving this email because of your account on code.onehippo.org.
___
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/CHANNELMGR-1391] CHANNELMGR-1391 Use helper method to initialize jsDate

[Mathijs den Burger]

Mathijs den Burger pushed to branch feature/CHANNELMGR-1391 at cms-community / 
hippo-addon-channel-manager


Commits:
6ef46192 by Mathijs den Burger at 2018-03-26T09:40:37+02:00
CHANNELMGR-1391 Use helper method to initialize jsDate

- - - - -


1 changed file:

- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js


Changes:

=
frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
=
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/contentEditor/fields/dateField/dateField.controller.js
@@ -40,6 +40,11 @@ export class DateValue {
 if (this.userTimeZone) {
   this.moment.tz(this.userTimeZone);
 }
+this._initJsDate();
+  }
+
+  _initJsDate () {
+// use only the year, month and day of the moment and ignore the time and 
time zone
 this.jsDate = new Date(this.moment.format('L'));
   }
 
@@ -93,7 +98,7 @@ export class DateValue {
   this.moment.year(date.getFullYear());
   this.moment.month(date.getMonth());
   this.moment.date(date.getDate()); // day of the month
-  this.jsDate = new Date(this.moment.format('L'));
+  this._initJsDate();
 } else {
   this._initBlank();
 }



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6ef46192dd0d0373d38841dd883985f81f941b6c

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/6ef46192dd0d0373d38841dd883985f81f941b6c
You're receiving this email because of your account on code.onehippo.org.
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn