[HippoCMS-scm] [Git][cms-community/hippo-cms-project][master] CMS-10830 Update tika dependency version from 1.3 to 1.7 to sync with the versio…
Arent-Jan Banck pushed to branch master at cms-community / hippo-cms-project Commits: 8a302dd3 by Arent-Jan Banck at 2017-07-13T16:50:47+02:00 CMS-10830 Update tika dependency version from 1.3 to 1.7 to sync with the version used in Jackrabbit and version of pdfbox used by the repository - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -73,8 +73,8 @@ 1.8.9 2.4.11 2.3.24-incubating -1.3 -1.3 +1.7 +1.7 2.9.1 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-project/commit/8a302dd3ecde24060ab168d0b576916c8d083fbb ___ 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-888
Michael Metternich deleted branch feature/CHANNELMGR-888 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/CHANNELMGR-888] 2 commits: CHANNELMGR-888 Minor code quality improvements
Michael Metternich pushed to branch feature/CHANNELMGR-888 at cms-community /
hippo-addon-channel-manager
Commits:
e2ed73b3 by Michael Metternich at 2017-07-13T16:34:14+02:00
CHANNELMGR-888 Minor code quality improvements
- Added private constructor to make instantiation impossible
- Exception that was not used defined as ignore
- Throw InternalServerErrorException instead of NotFoundException since
this better covers the situation.
- Rename private method
- - - - -
3ee23ec5 by Michael Metternich at 2017-07-13T16:43:04+02:00
CHANNELMGR-888 Remove println
- - - - -
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
@@ -25,6 +25,7 @@ import
org.onehippo.cms.channelmanager.content.documenttype.field.FieldTypeUtils
import org.onehippo.cms.channelmanager.content.documenttype.model.DocumentType;
import
org.onehippo.cms.channelmanager.content.documenttype.util.LocalizationUtils;
import org.onehippo.cms.channelmanager.content.error.ErrorWithPayloadException;
+import
org.onehippo.cms.channelmanager.content.error.InternalServerErrorException;
import org.onehippo.cms.channelmanager.content.error.NotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,14 +45,17 @@ class DocumentTypesServiceImpl implements
DocumentTypesService {
return INSTANCE;
}
+private DocumentTypesServiceImpl() {
+
+}
+
@Override
public DocumentType getDocumentType(final String id, final Session
userSession, final Locale locale)
throws ErrorWithPayloadException {
-
try {
-return DOCUMENT_TYPES.get(id, () -> getDocType(id, userSession,
locale));
-} catch (final ExecutionException e) {
-throw new NotFoundException();
+return DOCUMENT_TYPES.get(id, () -> createDocumentType(id,
userSession, locale));
+} catch (final ExecutionException ignore) {
+throw new InternalServerErrorException();
}
}
@@ -60,7 +64,7 @@ class DocumentTypesServiceImpl implements
DocumentTypesService {
DOCUMENT_TYPES.invalidateAll();
}
-private DocumentType getDocType(final String id, final Session
userSession, final Locale locale) throws NotFoundException {
+private DocumentType createDocumentType(final String id, final Session
userSession, final Locale locale) throws NotFoundException {
final DocumentType docType = new DocumentType();
final ContentTypeContext context =
ContentTypeContext.createForDocumentType(id, userSession, locale, docType)
.orElseThrow(NotFoundException::new);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/0aa8abd10010830041fe6395e2691363cf3c8b1f...3ee23ec52e4a1e4cf91b697c9b6c63be1900885a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10060] CMS-10060 Make sure name column resizes
Arthur Bogaart pushed to branch bugfix/CMS-10060 at cms-community / hippo-cms
Commits:
05bc445c by Arthur Bogaart at 2017-07-13T15:56:31+02:00
CMS-10060 Make sure name column resizes
- Name column should become smaller when window gets smaller
- Make sure name column does not get smaller than 90px when expanded
- Fix 1px issue by moving left-border and extracting it from
max-width
- - - - -
3 changed files:
-
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/hippodatatable/hippodatatable.js
- api/src/main/styling/styles/_doclist.scss
- api/src/main/styling/styles/_navigator.scss
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/hippodatatable/hippodatatable.js
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/hippodatatable/hippodatatable.js
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/yui/inc/hippo/281/hippodatatable/hippodatatable.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2014 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2010-2017 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.
@@ -56,6 +56,7 @@
tbody.height(sizes.wrap.h - theadRow.height() -
tfootRow.height());
+theadRow.css('max-width', sizes.wrap.w-1 + 'px');
theadRow.width(tbody[0].scrollWidth);
}
}
=
api/src/main/styling/styles/_doclist.scss
=
--- a/api/src/main/styling/styles/_doclist.scss
+++ b/api/src/main/styling/styles/_doclist.scss
@@ -1,4 +1,4 @@
-// Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+// Copyright 2014-2017 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.
@@ -35,9 +35,11 @@ $doclist-icon-shift-right: 2px;
&.doclisting-date {
@include fixed-width(140px);
}
+
&.doclisting-height {
@include fixed-width(75px);
}
+
&.doclisting-icon {
@include fixed-width(32px);
@@ -64,25 +66,34 @@ $doclist-icon-shift-right: 2px;
}
}
}
+
&.doclisting-lastmodified-by {
@include fixed-width(120px);
&:last-child {
@include fixed-width(200px);
}
}
+
&.doclisting-mimetype {
@include fixed-width(130px);
span {
@include truncate();
}
}
+
&.doclisting-name {
width: 100%;
+ min-width: 90px;
+}
+
+.yui-layout-collapsed &.doclisting-name {
min-width: 10px;
}
+
&.doclisting-path {
@include fixed-width(400px);
}
+
&.doclisting-selector {
@include fixed-width(19px);
span {
@@ -91,9 +102,11 @@ $doclist-icon-shift-right: 2px;
align-content: center;
}
}
+
&.doclisting-size {
@include fixed-width(80px);
}
+
&.doclisting-state {
@include fixed-width(51px);
@@ -113,6 +126,7 @@ $doclist-icon-shift-right: 2px;
}
}
+
&.doclisting-translations {
@include fixed-width(120px);
padding-top: 0;
@@ -130,9 +144,11 @@ $doclist-icon-shift-right: 2px;
height: 16px;
}
}
+
&.doclisting-type {
@include fixed-width(110px);
}
+
&.doclisting-width {
@include fixed-width(75px);
}
@@ -158,6 +174,7 @@ $doclist-icon-shift-right: 2px;
&:hover {
color: $primary;
}
+
// align the background image of the icon column header with the icons
in the body
&.doclisting-icon {
background-position: top ($doclist-padding-icon + 1) left
($doclist-padding-icon + $doclist-icon-shift-right + 8);
@@ -194,15 +211,18 @@ $doclist-icon-shift-right: 2px;
> span {
background: none;
}
+
&.hippo-list-order-none {
background-image: url("#{$images}/icons/stateorder-none.svg");
&:hover {
background-image: url("#{$images}/icons/stateorder-hover.svg");
}
}
+
&.hippo-list-order-ascending {
background-image: url("#{$images}/icons/stateorder-down.svg");
}
+
&.hippo-list-order-descending {
background-image: url("#{$images}/icons/stateorder-up.svg");
}
=
api/src/main/styling/styles/_navigator.scss
=
--- a/api/src/main/styling/styles/_navigator.scss
+++ b/api/src/main/styling/styles/_navigator.scss
@@ -30,13 +30,12 @@
.navigator-center-body .hippo-list-documents {
- border-left: 1px solid $doclist-body-border-color;
-
> thead {
border-left: 1px solid
[HippoCMS-scm] [Git][cms-community/hippo-repository] Deleted branch feature/REPO-1736
Michael Metternich deleted branch feature/REPO-1736 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-repository][feature/REPO-1736] REPO-1736 Cleaned up code and removed synchronized from #doConfigure
Michael Metternich pushed to branch feature/REPO-1736 at cms-community /
hippo-repository
Commits:
cd5e0293 by Michael Metternich at 2017-07-13T14:14:29+02:00
REPO-1736 Cleaned up code and removed synchronized from #doConfigure
Synchronized keyword seems to be added by accident and poses a potential
locking threat.
- - - - -
1 changed file:
-
jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
Changes:
=
jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
=
---
a/jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
+++
b/jaxrs/src/main/java/org/onehippo/repository/jaxrs/api/JsonResourceServiceModule.java
@@ -52,11 +52,11 @@ public abstract class JsonResourceServiceModule extends
AbstractReconfigurableDa
private final List listeners = new ArrayList<>();
@Override
-protected final synchronized void doConfigure(final Node moduleConfig)
throws RepositoryException {
+protected final void doConfigure(final Node moduleConfig) throws
RepositoryException {
endpointAddress = RepositoryJaxrsEndpoint.qualifiedAddress(
JcrUtils.getStringProperty(moduleConfig, ENDPOINT_ADDRESS,
moduleConfig.getParent().getName()));
if (jaxrsEndpoint != null) {
-String currentAddress = jaxrsEndpoint.getAddress();
+final String currentAddress = jaxrsEndpoint.getAddress();
if (!endpointAddress.equals(currentAddress)) {
RepositoryJaxrsService.removeEndpoint(currentAddress);
jaxrsEndpoint.address(endpointAddress);
@@ -81,14 +81,14 @@ public abstract class JsonResourceServiceModule extends
AbstractReconfigurableDa
listeners.forEach(listener -> listener.attach(observationManager));
}
-protected abstract Object getRestResource(ManagedUserSessionInvoker
managedUserSessionInvoker);
+protected abstract Object getRestResource(final ManagedUserSessionInvoker
sessionInvoker);
@Override
protected void doShutdown() {
try {
final ObservationManager observationManager =
session.getWorkspace().getObservationManager();
listeners.forEach(listener -> listener.detach(observationManager));
-} catch (final RepositoryException e) {
+} catch (final RepositoryException ignore) {
log.info("Failed to retrieve observation manager, can not detach
event listeners.");
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/cd5e029331209a01e84f78d1d5db43a1456631e2
___
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-4074: jackrabbit-jcr2dav: add system property to disable davex support for t…
GitLab Mirror pushed to branch 2.12 at cms-community / hippo-jackrabbit
Commits:
bf7f5156 by Julian Reschke at 2017-07-13T11:23:24+00:00
JCR-4074: jackrabbit-jcr2dav: add system property to disable davex support for
testing (ported to 2.12)
git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.12@1801829
13f79535-47bb-0310-9956-ffa450edef68
- - - - -
1 changed file:
-
jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
Changes:
=
jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
=
---
a/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
+++
b/jackrabbit-jcr2dav/src/test/java/org/apache/jackrabbit/jcr2dav/RepositoryStubImpl.java
@@ -104,7 +104,8 @@ public class RepositoryStubImpl extends
JackrabbitRepositoryStub {
String uri = "http://localhost:; + connector.getLocalPort() +
"/";
-parameters.put(JcrUtils.REPOSITORY_URI, uri);
+String parmName = System.getProperty(this.getClass().getName()
+ ".REPURIPARM", JcrUtils.REPOSITORY_URI);
+parameters.put(parmName, uri);
parameters.put(PROP_ACCESSCONTROL_PROVIDER_CLASS,
acProviderImplClass);
client = JcrUtils.getRepository(parameters);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/bf7f51562ba4f6052d38ecea1abda015a749d390
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-services-webfiles][master] CMS-10823 Bump parent-project version
Arent-Jan Banck pushed to branch master at cms-community / hippo-services-webfiles Commits: 484ad4f4 by Arent-Jan Banck at 2017-07-13T12:27:26+02:00 CMS-10823 Bump parent-project version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.onehippo.cms7 hippo-cms7-project -29 +29.1-SNAPSHOT Hippo CMS7 Services - webfiles View it on GitLab: https://code.onehippo.org/cms-community/hippo-services-webfiles/commit/484ad4f489a9db099db690535f5697221054e18d ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][master] CMS-10823 Bump parent-project version
Arent-Jan Banck pushed to branch master at cms-community / hippo-cms Commits: f4fd6045 by Arent-Jan Banck at 2017-07-13T12:25:13+02:00 CMS-10823 Bump parent-project version - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-project -29 +29.1-SNAPSHOT hippo-cms View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms/commit/f4fd6045c0d7ac4448ff0982ac5b42ef908a9079 ___ 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][master] CMS-10823 Bump project and services-webfiles versions
Arent-Jan Banck pushed to branch master at cms-community / hippo-cms-release Commits: 8a44c449 by Arent-Jan Banck at 2017-07-13T12:22:24+02:00 CMS-10823 Bump project and services-webfiles versions - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.onehippo.cms7 hippo-cms7-project -29 +29.1-SNAPSHOT hippo-cms7-release @@ -58,7 +58,7 @@ 4.0.0 4.0.0 4.0.0 -4.0.0 + 4.0.1-SNAPSHOT 1.0.0 4.0.0 1.0.0 View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/commit/8a44c44914fde496eba2ee2029bb9e74bb3e3c7f ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch feature/CMS-10784
Jeroen Hoffman deleted branch feature/CMS-10784 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-cms][master] 6 commits: CMS-10784 show an info message that warns about the checked-in state
Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
1dc4b956 by Bert Leunis at 2017-06-09T16:47:42+02:00
CMS-10784 show an info message that warns about the checked-in state
- - - - -
fb53bb83 by Bert Leunis at 2017-07-10T11:55:48+02:00
CMS-10784 Merge master changes in feature/CMS-10784
- - - - -
7320e8dd by Jeroen Hoffman at 2017-07-11T14:49:31+02:00
CMS-10784 Merge branch master into feature/CMS-10784
- - - - -
03f24387 by Bert Leunis at 2017-07-11T16:52:34+02:00
CMS-10784 disable editor for checked in nodes. message in properties file.
- - - - -
97089651 by Jeroen Hoffman at 2017-07-13T11:46:49+02:00
Merge remote-tracking branch origin/feature/CMS-10784 into
feature/CMS-10784
- - - - -
40399ed1 by Jeroen Hoffman at 2017-07-13T12:04:50+02:00
CMS-10784 Reintegrate branch feature/CMS-10784 into master
- - - - -
5 changed files:
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
- +
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.properties
-
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
- +
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/dialog-information-16.png
Changes:
=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
=
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.html
@@ -15,6 +15,7 @@
-->
http://wicket.apache.org/;>
+ [message]
[UUID]
=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
=
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2014 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-2017 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.
@@ -20,6 +20,7 @@ import javax.jcr.RepositoryException;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.event.IEvent;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
@@ -30,13 +31,19 @@ public class EditorPlugin extends RenderPlugin {
private static final long serialVersionUID = 1L;
private final NodeEditor editor;
+private Label message;
public EditorPlugin(IPluginContext context, IPluginConfig config) {
super(context, config);
+message = new Label("message", getString("node.checked.in.info"));
+add(message);
+
editor = new NodeEditor("editor", getModel());
add(editor);
add(new ToggleBehavior());
+
+onModelChanged();
}
protected IPluginContext getPluginContext() {
@@ -55,6 +62,8 @@ public class EditorPlugin extends RenderPlugin {
} else {
add(new AttributeModifier("style",
"background-color:#ddd;"));
}
+message.setVisible(!node.isCheckedOut());
+editor.setEnabled(node.isCheckedOut());
redraw();
}
=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.properties
=
--- /dev/null
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/editor/EditorPlugin.properties
@@ -0,0 +1 @@
+node.checked.in.info=This node is checked in. You must check it out before you
can edit it.
\ No newline at end of file
=
console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
=
---
a/console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
+++
b/console/frontend/src/main/resources/org/hippoecm/frontend/plugins/console/console.css
@@ -549,6 +549,16 @@ li.hippo-console-menu-actions-save.session-changes a {
padding: 20px;
}
+.hippo-console-editor .panel-message {
+ background-image: url("dialog-information-16.png");
+ background-repeat: no-repeat;
+ background-position: 10px 10px;
+ background-color: #fff8d5;
+ padding: 10px 10px 10px 35px;
+ border: 1px solid #69849f;
+ margin-bottom: 15px;
+}
+
[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/CHANNELMGR-1354] CHANNELMGR-1354 Re-order unit tests sequence for primitiveField
Ariel Weinberger pushed to branch feature/CHANNELMGR-1354 at cms-community /
hippo-addon-channel-manager
Commits:
92cc9dd6 by Ariel Weinberger at 2017-07-13T10:24:06+02:00
CHANNELMGR-1354 Re-order unit tests sequence for primitiveField
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.spec.js
@@ -177,9 +177,9 @@ describe('PrimitiveField', () => {
spyOn(FieldService, 'unsetFocusedInput');
$ctrl.focusPrimitive($event);
+expect(FieldService.setFocusedInput).toHaveBeenCalledWith($event.target,
$event.customFocus);
$event.target.triggerHandler('blur.focusedInputBlurHandler');
-expect(FieldService.setFocusedInput).toHaveBeenCalledWith($event.target,
$event.customFocus);
expect(FieldService.shouldUnsetFocus).toHaveBeenCalled();
expect(FieldService.unsetFocusedInput).toHaveBeenCalled();
});
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/92cc9dd6b9accfdcba1cc39cac8654245f37d8cd
___
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-1354] CHANNELMGR-1354 Fix typo in FieldService spec
Ariel Weinberger pushed to branch feature/CHANNELMGR-1354 at cms-community /
hippo-addon-channel-manager
Commits:
12fe58f6 by Ariel Weinberger at 2017-07-13T10:18:43+02:00
CHANNELMGR-1354 Fix typo in FieldService spec
- - - - -
1 changed file:
-
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/field.service.spec.js
Changes:
=
frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/field.service.spec.js
=
---
a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/field.service.spec.js
+++
b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/field.service.spec.js
@@ -120,7 +120,7 @@ describe('field service', () => {
expect(FieldService._customFocusCallback).toEqual(null);
});
-describe('triggetInputFocus', () => {
+describe('triggerInputFocus', () => {
it('should not do anything if there is no focused input', () => {
spyOn(FieldService, '_customFocusCallback');
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/12fe58f6f5c9cba6b1dc5a63158867f2cd511e25
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
