[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager] Deleted branch feature/cmng-psp1-CHANNELMGR-556
Tobias Jeger deleted branch feature/cmng-psp1-CHANNELMGR-556 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-cms-release][feature/translations-psp2] CMS-10010 revert the execution removal since it does not seem to work after all
Ard Schrijvers pushed to branch feature/translations-psp2 at cms-community /
hippo-cms-release
Commits:
707862e1 by Ard Schrijvers at 2016-04-05T16:55:51+02:00
CMS-10010 revert the execution removal since it does not seem to work after all
- - - - -
1 changed file:
- pom.xml
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -887,6 +887,16 @@
${hippo.cms.included.locales}
+
+
+
+includeLocales
+
+
+${hippo.cms.included.locales}
+
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-release/commit/707862e1832fbc44d341c0dd7c51a6016f6a55c7
___
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-556: When deleting a component, it is not logical to reset it to the original state.
Tobias Jeger pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
73dfbecb by Canh Ngo at 2016-04-05T15:34:13+02:00
CHANNELMGR-556: When deleting a component, it is not logical to reset it to the
original state.
Because the component has been removed, so the call to reset it is not
necessary, which also causes 404.
- - - - -
2 changed files:
-
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesPanel.js
-
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesWindow.js
Changes:
=
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesPanel.js
=
---
a/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesPanel.js
+++
b/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesPanel.js
@@ -108,8 +108,11 @@
this.fireEvent('onLoad');
},
-clearComponent: function () {
- this._renderInitialComponentState();
+clearComponent: function (componentRemoved) {
+ if (!componentRemoved) {
+// only re-render the initial state if the component is not removed
+this._renderInitialComponentState();
+ }
this.hasComponent = false;
},
=
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesWindow.js
=
---
a/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesWindow.js
+++
b/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ComponentPropertiesWindow.js
@@ -160,7 +160,7 @@
onComponentRemoved: function () {
// clear recorded changes because the component has been removed.
- this.componentPropertiesPanel.clearComponent();
+ this.componentPropertiesPanel.clearComponent(true);
}
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/73dfbecb9e195f05763d163bb110fb6fc8530a75
___
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-556
Canh Ngo pushed new branch feature/cmng-psp1-CHANNELMGR-556 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/cmng-psp1-CHANNELMGR-542
Mathijs den Burger deleted branch feature/cmng-psp1-CHANNELMGR-542 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-542] CHANNELMGR-542 remove superfluous semi-colons from created style
Mathijs den Burger pushed to branch feature/cmng-psp1-CHANNELMGR-542 at
cms-community / hippo-addon-channel-manager
Commits:
dcef88f9 by Mathijs den Burger at 2016-04-05T14:46:53+02:00
CHANNELMGR-542 remove superfluous semi-colons from created style
- - - - -
1 changed file:
- frontend-ng/src/angularjs/utils/dom.service.js
Changes:
=
frontend-ng/src/angularjs/utils/dom.service.js
=
--- a/frontend-ng/src/angularjs/utils/dom.service.js
+++ b/frontend-ng/src/angularjs/utils/dom.service.js
@@ -72,13 +72,13 @@ export class DomService {
if (fromValue.length > 0) {
const toValue = toComputedStyle.getPropertyValue(cssPropertyName);
if (fromValue !== toValue) {
-cssDiff.push(`${cssPropertyName}:${fromValue};`);
+cssDiff.push(`${cssPropertyName}:${fromValue}`);
}
}
} else {
const toStyleValue = toElement.style.getPropertyValue(cssPropertyName);
if (toStyleValue.length > 0) {
- cssDiff.push(`${cssPropertyName}:${toStyleValue};`);
+ cssDiff.push(`${cssPropertyName}:${toStyleValue}`);
}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/dcef88f989b78f63eff01d5d5409a1077aaa958c
___
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] 2 commits: CHANNELMGR-552: reloaded the channel-store whenever switching-channel event is s…
Canh Ngo pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
8d92cbb4 by Canh Ngo at 2016-04-05T12:56:13+02:00
CHANNELMGR-552: reloaded the channel-store whenever switching-channel event is
sent from AngularJS app
When editing a channel at the first time, the channel-store in ExtJs is
outdated because the 'edit-channel' request creating the '-preview' channel is
invoked from AngularJs. The 'switch-channel' event is sent from AngularJs with
the '-preview' channel id, so the channel-store in ExtJs should be reloaded to
update this change.
- - - - -
22c88608 by Canh Ngo at 2016-04-05T14:25:00+02:00
CHANNELMGR-552: Merge branch 'feature/cmng-psp1-CHANNELMGR-552' into
feature/cmng-psp1
- - - - -
1 changed file:
-
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
Changes:
=
frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
=
---
a/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
+++
b/frontend/src/main/resources/org/onehippo/cms7/channelmanager/channeleditor/ChannelEditor.js
@@ -73,8 +73,8 @@
_setChannel: function(channelId) {
return new Hippo.Future(function (success, failure) {
-this.channelStoreFuture.when(function (config) {
- var channelRecord = config.store.getById(channelId);
+this._reloadChannels().when(function (channelStore) {
+ var channelRecord = channelStore.getById(channelId);
if (channelRecord) {
this._initialize(channelRecord.json);
success(channelRecord);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/e7c44bc1208d1b0b4fb9f09c63c3f33cc7ab46df...22c8860892884c0d32b42bc11fb8d87b4eaa4fdd
___
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-552
Canh Ngo pushed new branch feature/cmng-psp1-CHANNELMGR-552 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-542
Mathijs den Burger pushed new branch feature/cmng-psp1-CHANNELMGR-542 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/cmng-psp1-CHANNELMGR-533
Tobias Jeger deleted branch feature/cmng-psp1-CHANNELMGR-533 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-site-toolkit][feature/cmng-psp1] HSTTWO-3633: push private utility method as protected into abstract superclass.
Tobias Jeger pushed to branch feature/cmng-psp1 at cms-community /
hippo-site-toolkit
Commits:
7139ea63 by Tobias Jeger at 2016-04-05T10:41:40+02:00
HSTTWO-3633: push private utility method as protected into abstract superclass.
- - - - -
2 changed files:
-
commons/src/main/java/org/hippoecm/hst/core/channelmanager/AbstractComponentWindowResponseAppender.java
-
components/core/src/main/java/org/hippoecm/hst/core/channelmanager/CmsComponentWindowResponseAppender.java
Changes:
=
commons/src/main/java/org/hippoecm/hst/core/channelmanager/AbstractComponentWindowResponseAppender.java
=
---
a/commons/src/main/java/org/hippoecm/hst/core/channelmanager/AbstractComponentWindowResponseAppender.java
+++
b/commons/src/main/java/org/hippoecm/hst/core/channelmanager/AbstractComponentWindowResponseAppender.java
@@ -17,6 +17,7 @@ package org.hippoecm.hst.core.channelmanager;
import java.util.Map;
+import org.hippoecm.hst.configuration.components.HstComponentConfiguration;
import org.hippoecm.hst.core.component.HstRequest;
import org.hippoecm.hst.core.component.HstResponse;
import org.hippoecm.hst.core.container.ContainerConstants;
@@ -53,4 +54,8 @@ public abstract class AbstractComponentWindowResponseAppender
implements Compone
return comment;
}
+protected static boolean isContainerOrContainerItem(final
HstComponentConfiguration compConfig) {
+return
HstComponentConfiguration.Type.CONTAINER_ITEM_COMPONENT.equals(compConfig.getComponentType())
+||
HstComponentConfiguration.Type.CONTAINER_COMPONENT.equals(compConfig.getComponentType());
+}
}
=
components/core/src/main/java/org/hippoecm/hst/core/channelmanager/CmsComponentWindowResponseAppender.java
=
---
a/components/core/src/main/java/org/hippoecm/hst/core/channelmanager/CmsComponentWindowResponseAppender.java
+++
b/components/core/src/main/java/org/hippoecm/hst/core/channelmanager/CmsComponentWindowResponseAppender.java
@@ -136,11 +136,6 @@ public class CmsComponentWindowResponseAppender extends
AbstractComponentWindowR
response.addEpilogue(createCommentWithAttr(epilogueAttributes,
response));
}
-private boolean isContainerOrContainerItem(final HstComponentConfiguration
compConfig) {
-return CONTAINER_ITEM_COMPONENT.equals(compConfig.getComponentType())
-|| CONTAINER_COMPONENT.equals(compConfig.getComponentType());
-}
-
final void populateAttributes(HstComponentWindow window, HstRequest
request,
Map preambleAttributes,
Map epilogueAttributes) {
for (ComponentWindowAttributeContributor attributeContributor :
attributeContributors) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/7139ea638ccaff2f8aa909ca71b4e57f0bb852df
___
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-554: reset min-height of empty containers to 'unset' if not set previously.
Tobias Jeger pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
3c6a82d8 by Tobias Jeger at 2016-04-05T10:20:04+02:00
CHANNELMGR-554: reset min-height of empty containers to 'unset' if not set
previously.
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlayElement.controller.js
@@ -42,7 +42,7 @@ export class OverlayElementCtrl {
}
// Set a minimal height of the element to ensure visibility / clickability.
-const originalMinHeight = boxJQueryElement[0].style.minHeight || 'auto';
+const originalMinHeight = boxJQueryElement[0].style.minHeight || 'unset';
this._setMinHeightSafely(boxJQueryElement[0], MIN_HEIGHT);
$scope.$on('$destroy', () => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3c6a82d8796e01b8bbbfe2be2530caa81a2f5317
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
