[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch feature/REPO-1612
Woonsan Ko pushed new branch feature/REPO-1612 at cms-community / hippo-repository ___ 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][bugfix/cm-overlay-CHANNELMGR-1090] CHANNELMGR-1090 Update experiment state on overlay sync
Mathijs den Burger pushed to branch bugfix/cm-overlay-CHANNELMGR-1090 at
cms-community / hippo-addon-channel-manager
Commits:
0fe43945 by Mathijs den Burger at 2017-01-17T16:57:33+01:00
CHANNELMGR-1090 Update experiment state on overlay sync
The experiment state may have changed, so we have to update the
state text every time a component is synced.
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js
@@ -327,6 +327,7 @@ class OverlayService {
overlayElement.toggleClass('hippo-overlay-element-container-disabled',
structureElement.isDisabled());
}
+this._syncExperimentState(structureElement, overlayElement);
this._syncPosition(overlayElement, boxElement);
}
@@ -345,6 +346,13 @@ class OverlayService {
}
}
+ _syncExperimentState(structureElement, overlayElement) {
+if (this._hasExperiment(structureElement)) {
+ const label =
this.ExperimentStateService.getExperimentStateLabel(structureElement);
+ overlayElement.find('.hippo-overlay-experiment-state-text').text(label);
+}
+ }
+
_syncPosition(overlayElement, boxElement) {
const rect = boxElement[0].getBoundingClientRect();
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.spec.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.spec.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.spec.js
@@ -18,6 +18,7 @@ describe('OverlayService', () => {
let $q;
let $rootScope;
let CmsService;
+ let ExperimentStateService;
let hstCommentsProcessorService;
let OverlayService;
let PageStructureService;
@@ -28,11 +29,12 @@ describe('OverlayService', () => {
beforeEach(() => {
angular.mock.module('hippo-cm.channel.hippoIframe');
-inject((_$q_, _$rootScope_, _CmsService_, _hstCommentsProcessorService_,
_OverlayService_,
+inject((_$q_, _$rootScope_, _CmsService_, _ExperimentStateService_,
_hstCommentsProcessorService_, _OverlayService_,
_PageStructureService_, _RenderingService_) => {
$q = _$q_;
$rootScope = _$rootScope_;
CmsService = _CmsService_;
+ ExperimentStateService = _ExperimentStateService_;
hstCommentsProcessorService = _hstCommentsProcessorService_;
OverlayService = _OverlayService_;
PageStructureService = _PageStructureService_;
@@ -238,6 +240,23 @@ describe('OverlayService', () => {
});
});
+ it('updates the experiment state of components', (done) => {
+loadIframeFixture(() => {
+ let componentWithExperiment = iframe('#hippo-overlay >
.hippo-overlay-element-component').eq(2);
+ let experimentStateText =
componentWithExperiment.find('.hippo-overlay-experiment-state-text');
+ expect(experimentStateText.html()).toBe('EXPERIMENT_LABEL_RUNNING');
+
+ spyOn(ExperimentStateService,
'getExperimentStateLabel').and.returnValue('EXPERIMENT_LABEL_COMPLETED');
+ OverlayService.sync();
+
+ componentWithExperiment = iframe('#hippo-overlay >
.hippo-overlay-element-component').eq(2);
+ experimentStateText =
componentWithExperiment.find('.hippo-overlay-experiment-state-text');
+ expect(experimentStateText.html()).toBe('EXPERIMENT_LABEL_COMPLETED');
+
+ done();
+});
+ });
+
it('syncs the position of overlay elements in view mode', (done) => {
OverlayService.setMode('view');
loadIframeFixture(() => {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/0fe439453d218fd69fca25aaff9005dc1519f33c
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.4] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()(ported to 2.4)
GitLab Mirror pushed to branch 2.4 at cms-community / hippo-jackrabbit
Commits:
b21dd628 by Julian Reschke at 2017-01-17T13:31:40+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not
hashCode()(ported to 2.4)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.4@1779191
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/b21dd628374ee2227c975bac12018c5aa02c7cdc
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10571
Bert Leunis pushed new branch bugfix/CMS-10571 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.10] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()(ported to 2.10)
GitLab Mirror pushed to branch 2.10 at cms-community / hippo-jackrabbit
Commits:
63891e99 by Julian Reschke at 2017-01-17T12:35:40+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not
hashCode()(ported to 2.10)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.10@1779181
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/63891e99541a3474bec19593e492275cd72b2bc8
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.6] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()(ported to 2.6)
GitLab Mirror pushed to branch 2.6 at cms-community / hippo-jackrabbit
Commits:
50fccdca by Julian Reschke at 2017-01-17T13:15:00+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not
hashCode()(ported to 2.6)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.6@1779187
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/50fccdca2fe6a490825cfb460f641be43cee677d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.8] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()(ported to 2.8)
GitLab Mirror pushed to branch 2.8 at cms-community / hippo-jackrabbit
Commits:
013a690f by Julian Reschke at 2017-01-17T12:51:18+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not
hashCode()(ported to 2.8)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.8@1779185
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/013a690f75e3399cf422d39f47881cce155a2bfb
___
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 bugfix/cm-overlay-CHANNELMGR-1090
Mathijs den Burger pushed new branch bugfix/cm-overlay-CHANNELMGR-1090 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-jackrabbit][2.14] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()(ported to 2.14)
GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits:
20f57a0c by Julian Reschke at 2017-01-17T11:13:00+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not
hashCode()(ported to 2.14)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1779171
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/20f57a0cf3d317de0bc9711b38afe027c2d42761
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][trunk] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()
GitLab Mirror pushed to branch trunk at cms-community / hippo-jackrabbit
Commits:
9098c557 by Julian Reschke at 2017-01-17T10:54:32+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/trunk@1779166
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/9098c557387fcfdb8224767725c5c1a7b2e78847
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-jackrabbit][2.12] JCR-4100: jackrabbit-webdav: Scope implements equals() but not hashCode()(ported to 2.12)
GitLab Mirror pushed to branch 2.12 at cms-community / hippo-jackrabbit
Commits:
30888f53 by Julian Reschke at 2017-01-17T12:06:49+00:00
JCR-4100: jackrabbit-webdav: Scope implements equals() but not
hashCode()(ported to 2.12)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.12@1779176
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
- jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
Changes:
=
jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
=
---
a/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
+++
b/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
@@ -63,22 +63,25 @@ public class Scope implements XmlSerializable {
return lockScope;
}
-/**
- * Returns true if this Scope is equal to the given one.
- *
- * @param obj
- * @return
- */
+@Override
+public int hashCode() {
+final int prime = 31;
+int result = 1;
+result = prime * result + localName.hashCode();
+result = prime * result + namespace.hashCode();
+return result;
+}
+
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
-}
-if (obj instanceof Scope) {
+} else if (obj instanceof Scope) {
Scope other = (Scope) obj;
return localName.equals(other.localName) &&
namespace.equals(other.namespace);
+} else {
+return false;
}
-return false;
}
/**
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/30888f53afe070f0f4e6117abdf285a2eef1e6e6
___
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 bugfix/cm-overlay-CHANNELMGR-1122
Mathijs den Burger pushed new branch bugfix/cm-overlay-CHANNELMGR-1122 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][bugfix/cm-overlay] CHANNELMGR-1123 Ensure *all* overlay-elements are permeable
Arthur Bogaart pushed to branch bugfix/cm-overlay at cms-community /
hippo-addon-channel-manager
Commits:
b321f5de by Arthur Bogaart at 2017-01-17T11:50:39+01:00
CHANNELMGR-1123 Ensure *all* overlay-elements are permeable
- - - - -
1 changed file:
- frontend-ng/src/styles/hippo-iframe.css
Changes:
=
frontend-ng/src/styles/hippo-iframe.css
=
--- a/frontend-ng/src/styles/hippo-iframe.css
+++ b/frontend-ng/src/styles/hippo-iframe.css
@@ -197,7 +197,7 @@ html {
}
.hippo-overlay-permeable .hippo-overlay,
-.hippo-overlay-permeable .hippo-overlay-element-component {
+.hippo-overlay-permeable .hippo-overlay-element {
pointer-events: none;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/b321f5dee43a0e16a6b24f2fb31c7fbec112138f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
