[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/cmng-psp1] 2 commits: CHANNELMGR-538: update unit test to use the 'unload' event as in the DragDropService
Canh Ngo pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
367996a7 by Canh Ngo at 2016-03-31T16:55:26+02:00
CHANNELMGR-538: update unit test to use the 'unload' event as in the
DragDropService
- - - - -
5d0b1128 by Canh Ngo at 2016-03-31T17:28:21+02:00
CHANNELMGR-539: used 'unload' event to replace the 'beforeunload' event, that
fixed exception when reloading iframe on discard
- - - - -
2 changed files:
- frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
- frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
@@ -111,7 +111,7 @@ describe('DragDropService', () => {
it('destroys dragula on iframe unload', (done) => {
loadIframeFixture((iframeWindow) => {
expect(DragDropService.drake).not.toBeNull();
- $(iframeWindow).trigger('beforeunload');
+ $(iframeWindow).trigger('unload');
expect(DragDropService.drake).toBeNull();
expect(DragDropService.isDragging()).toBeFalsy();
done();
=
frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
=
---
a/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
+++
b/frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlaySync.service.js
@@ -55,7 +55,7 @@ export class OverlaySyncService {
characterData: true,
subtree: true,
});
-$(iframeWindow).on('beforeunload', () => this._onUnLoad());
+$(iframeWindow).on('unload', () => this._onUnLoad());
$(this.$window).on('resize.overlaysync', () => this.syncIframe());
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/8fb54442b153e01cf88b4db213893f37e8a4eadc...5d0b1128c85143ebeb7bb7502679cd38ad9a971b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations] Pushed new branch master
Unico Hommes pushed new branch master at cms-community / hippo-cms-translations ___ 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 Add hippo maven l10n plugin to pluginManagement
Ard Schrijvers pushed to branch feature/translations-psp2 at cms-community /
hippo-cms-release
Commits:
ef78f463 by Ard Schrijvers at 2016-03-31T16:41:45+02:00
CMS-10010 Add hippo maven l10n plugin to pluginManagement
- - - - -
1 changed file:
- pom.xml
Changes:
=
pom.xml
=
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,9 @@
3.0.0-SNAPSHOT
3.0.0-SNAPSHOT
+1.0-SNAPSHOT
+
+
@@ -872,6 +875,27 @@
+
+ com.onehippo.maven.plugin
+ hippo-l10n-maven-plugin
+ ${hippo.maven.plugin.l10n}
+
+
+ org.onehippo.cms7:hippo-cms-
+
com.onehippo.cms7:hippo-addon-eforms-
+
+
+
+
+
+injectLocales
+
+
+${supported.locales}
+
+
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-release/commit/ef78f46337cd5f6b0bcde6a2d4476e01ae9a63ff
___
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-538: replaced 'beforeunload' with 'unload' because the former was not…
Canh Ngo pushed to branch feature/cmng-psp1 at cms-community /
hippo-addon-channel-manager
Commits:
8fb54442 by Canh Ngo at 2016-03-31T16:08:12+02:00
CHANNELMGR-538: replaced 'beforeunload' with 'unload' because the former was
not fired when navigating out to Channel Perspective and open the channel in
edit mode again
It is expected to call _destroyDragula() whenever navigating to a different
page, or opening a channel.
- - - - -
1 changed file:
- frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
Changes:
=
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
=
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
@@ -44,7 +44,7 @@ export class DragDropService {
_onLoad() {
this.iframe = this.iframeJQueryElement[0].contentWindow;
-$(this.iframe).one('beforeunload', () => this._destroyDragula());
+$(this.iframe).one('unload', () => this._destroyDragula());
}
_destroyDragula() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/8fb54442b153e01cf88b4db213893f37e8a4eadc
___
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] Pushed new branch feature/translations-psp2
Ard Schrijvers pushed new branch feature/translations-psp2 at cms-community / hippo-cms-release ___ 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 tag hippo-cms-2.24.23
Junaidh Kadhar Sheriff pushed new tag hippo-cms-2.24.23 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] Deleted tag hippo-cms-2.24.23
Arent-Jan Banck deleted tag hippo-cms-2.24.23 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] Pushed new tag hippo-cms-2.24.23-SNAPSHOT
Arent-Jan Banck pushed new tag hippo-cms-2.24.23-SNAPSHOT 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-site-toolkit] Pushed new tag hst-2.26.18
Junaidh Kadhar Sheriff pushed new tag hst-2.26.18 at cms-community / hippo-site-toolkit ___ 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] Deleted tag hst-2.26.18
Arent-Jan Banck deleted tag hst-2.26.18 at cms-community / hippo-site-toolkit ___ 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] Pushed new tag hst-2.26.18-SNAPSHOT
Arent-Jan Banck pushed new tag hst-2.26.18-SNAPSHOT at cms-community / hippo-site-toolkit ___ 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-497] CHANNELMGR-497: add qa classes for testing.
Tobias Jeger pushed to branch feature/cmng-psp1-CHANNELMGR-497 at cms-community
/ hippo-addon-channel-manager
Commits:
743b11e4 by Tobias Jeger at 2016-03-31T13:56:36+02:00
CHANNELMGR-497: add qa classes for testing.
- - - - -
4 changed files:
- frontend-ng/src/angularjs/channel/channel.controller.js
- frontend-ng/src/angularjs/channel/channel.html
- frontend-ng/src/i18n/hippo-cm.en.json
- frontend-ng/src/i18n/hippo-cm.nl.json
Changes:
=
frontend-ng/src/angularjs/channel/channel.controller.js
=
--- a/frontend-ng/src/angularjs/channel/channel.controller.js
+++ b/frontend-ng/src/angularjs/channel/channel.controller.js
@@ -42,16 +42,19 @@ export class ChannelCtrl {
name: 'desktop',
icon: 'computer',
width: 0,
+titleKey: 'VIEWPORT_WIDTH_DESKTOP',
},
{
name: 'tablet',
icon: 'tablet',
width: 720,
+titleKey: 'VIEWPORT_WIDTH_TABLET',
},
{
name: 'phone',
icon: 'smartphone',
width: 320,
+titleKey: 'VIEWPORT_WIDTH_PHONE',
},
];
=
frontend-ng/src/angularjs/channel/channel.html
=
--- a/frontend-ng/src/angularjs/channel/channel.html
+++ b/frontend-ng/src/angularjs/channel/channel.html
@@ -22,12 +22,12 @@
{{ 'TOOLBAR_BUTTON_COMPONENTS' | translate }}
-
+
- {{viewPort.icon}}
+ {{viewPort.icon}}
=
frontend-ng/src/i18n/hippo-cm.en.json
=
--- a/frontend-ng/src/i18n/hippo-cm.en.json
+++ b/frontend-ng/src/i18n/hippo-cm.en.json
@@ -13,5 +13,8 @@
"CONFIRM_DISCARD_OWN_CHANGES_MESSAGE": "Are you sure you want to discard all
your unpublished changes to this channel?",
"BUTTON_YES": "Yes",
"BUTTON_NO": "No",
- "ERROR_CREATE_PREVIEW": "Failed to enter Edit mode."
+ "ERROR_CREATE_PREVIEW": "Failed to enter Edit mode.",
+ "VIEWPORT_WIDTH_DESKTOP": "desktop",
+ "VIEWPORT_WIDTH_PHONE": "phone (320px)",
+ "VIEWPORT_WIDTH_TABLET": "tablet (720px)"
}
=
frontend-ng/src/i18n/hippo-cm.nl.json
=
--- a/frontend-ng/src/i18n/hippo-cm.nl.json
+++ b/frontend-ng/src/i18n/hippo-cm.nl.json
@@ -13,5 +13,8 @@
"CONFIRM_DISCARD_OWN_CHANGES_MESSAGE": "Weet u zeker dat u al uw
ongepubliceerde veranderingen in deze channel ongedaan wilt maken?",
"BUTTON_YES": "Ja",
"BUTTON_NO": "Nee",
- "ERROR_CREATE_PREVIEW": "Naar Bewerk modus schakelen heeft gefaald."
+ "ERROR_CREATE_PREVIEW": "Naar Bewerk modus schakelen heeft gefaald.",
+ "VIEWPORT_WIDTH_DESKTOP": "desktop",
+ "VIEWPORT_WIDTH_PHONE": "smartphone (320px)",
+ "VIEWPORT_WIDTH_TABLET": "tablet (720px)"
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/743b11e4e4e99d0094f775187de9b5b4d7dbf090
___
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 bugfix/CMS-9994
Unico Hommes deleted branch bugfix/CMS-9994 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
