Joeri de Gooijer pushed to branch bugfix/cm-overlay at cms-community / hippo-addon-channel-manager
Commits: 7b9c569e by Joeri de Gooijer at 2016-12-29T18:32:54+01:00 CHANNELMGR-1094 Move component to appropriate folder - - - - - c015b9cb by Joeri de Gooijer at 2016-12-30T09:54:26+01:00 CHANNELMGR-1094 Move files to functionality based folders - - - - - bf4e2017 by Joeri de Gooijer at 2016-12-30T10:35:24+01:00 CHANNELMGR-1094 Remove componentAdder directive - - - - - b4b45d8d by Joeri de Gooijer at 2016-12-30T13:42:56+01:00 CHANNELMGR-1094 Clean up unused service - - - - - 3c6b7ffc by Joeri de Gooijer at 2016-12-30T13:50:34+01:00 CHANNELMGR-1094 clean up unit tests - - - - - c97ca4fa by Joeri de Gooijer at 2016-12-30T14:45:03+01:00 CHANNELMGR-1094 Fix unit tests - - - - - afdbc159 by Joeri de Gooijer at 2016-12-30T14:54:57+01:00 CHANNELMGR-1094 Remove catalog component jquery element - - - - - 40901833 by Joeri de Gooijer at 2016-12-30T14:55:32+01:00 CHANNELMGR-1094 Remove obsolete styling - - - - - 108561ef by Joeri de Gooijer at 2016-12-30T15:17:06+01:00 CHANNELMGR-1094 Style catalog list - - - - - 6ab23743 by Joeri de Gooijer at 2016-12-30T15:44:51+01:00 CHANNELMGR-1094 Refactor some styling - - - - - ba9b2b99 by Joeri de Gooijer at 2017-01-03T09:57:42+01:00 CHANNELMGR-1094 Move catalog to separate component - - - - - a2445d99 by Joeri de Gooijer at 2017-01-03T11:54:56+01:00 CHANNELMGR-1094 Refactor mask service - - - - - 404c6f7d by Joeri de Gooijer at 2017-01-03T11:55:03+01:00 CHANNELMGR-1094 Add tests for mask service - - - - - a888c9d8 by Joeri de Gooijer at 2017-01-03T12:20:59+01:00 CHANNELMGR-1094 Move componentCatalog to sidenav and pass outputs - - - - - a6db4769 by Joeri de Gooijer at 2017-01-03T14:28:15+01:00 CHANNELMGR-1094 Set z-index on iframe when activating mask - - - - - 81a34d48 by Joeri de Gooijer at 2017-01-03T17:06:48+01:00 CHANNELMGR-1094 Move mask logic to mask component - - - - - fc016ce8 by Joeri de Gooijer at 2017-01-03T17:23:23+01:00 CHANNELMGR-1094 Add click handler to mask - - - - - 0b311ba4 by Joeri de Gooijer at 2017-01-03T17:23:58+01:00 CHANNELMGR-1094 Hide mask on click when added by component catalog - - - - - db420c9a by Joeri de Gooijer at 2017-01-03T18:09:46+01:00 CHANNELMGR-1094 Show selected component in list when mask is active - - - - - 36112779 by Joeri de Gooijer at 2017-01-03T18:13:59+01:00 CHANNELMGR-1094 Remove click handler when deselecting - - - - - 40988e0e by Joeri de Gooijer at 2017-01-03T18:26:08+01:00 CHANNELMGR-1094 Rename module file with .module.js extention - - - - - d7aae42e by Joeri de Gooijer at 2017-01-03T18:29:05+01:00 CHANNELMGR-1094 Move select logic to service so it can be reused - - - - - efcf9ca8 by Joeri de Gooijer at 2017-01-03T18:30:45+01:00 CHANNELMGR-1094 Move component catalog to parent folder - - - - - b6fee090 by Joeri de Gooijer at 2017-01-04T15:00:53+01:00 CHANNELMGR-1094 Merge branch 'bugfix/cm-overlay' into bugfix/cm-overlay-CHANNELMGR-1094 - - - - - 06e7ae13 by Joeri de Gooijer at 2017-01-04T16:06:01+01:00 CHANNELMGR-1094 Use $apply in external click handler Since the click handler on an overlay element is 'outside' angular we need to use $apply when calling show component properties in order to activate the mask - - - - - e509a389 by Joeri de Gooijer at 2017-01-05T14:05:25+01:00 CHANNELMGR-1094 Unmask and deselect component when clicking in iframe - - - - - cba6fdba by Joeri de Gooijer at 2017-01-05T14:50:01+01:00 CHANNELMGR-1094 Do not show components when adding a new one - - - - - 61b91db1 by Joeri de Gooijer at 2017-01-05T14:57:02+01:00 CHANNELMGR-1094 Add pointer cue where to add component - - - - - de49a3a6 by Joeri de Gooijer at 2017-01-06T15:00:33+01:00 CHANNELMGR-1094 Register click handler on containers - - - - - 2ef6b7af by Joeri de Gooijer at 2017-01-06T16:48:28+01:00 CHANNELMGR-1094 Add component to container - - - - - f982399a by Joeri de Gooijer at 2017-01-06T16:53:06+01:00 CHANNELMGR-1094 Merge branch 'bugfix/cm-overlay' into bugfix/cm-overlay-CHANNELMGR-1094 - - - - - ea7245fa by Joeri de Gooijer at 2017-01-10T16:41:22+01:00 CHANNELMGR-1094 Add styling for cursor and containers when in add mode - - - - - 22e5063f by Joeri de Gooijer at 2017-01-10T16:59:42+01:00 CHANNELMGR-1094 Merge branch 'bugfix/cm-overlay' into bugfix/cm-overlay-CHANNELMGR-1094 - - - - - a09fb181 by Joeri de Gooijer at 2017-01-11T13:19:21+01:00 CHANNELMGR-1094 Merge branch 'bugfix/cm-overlay' into bugfix/cm-overlay-CHANNELMGR-1094 - - - - - 759da791 by Joeri de Gooijer at 2017-01-11T15:43:41+01:00 CHANNELMGR-1094 Update spec files for mask service - - - - - 484a3176 by Joeri de Gooijer at 2017-01-11T17:00:06+01:00 CHANNELMGR-1094 Add tests for mask controller - - - - - 0e95bba3 by Joeri de Gooijer at 2017-01-11T17:17:17+01:00 CHANNELMGR-1094 Add tests for catalog component controller - - - - - a6a38b13 by Joeri de Gooijer at 2017-01-12T15:27:29+01:00 CHANNELMGR-1094 Use constructor instead of initialize method This sets the default settings just once instead of on every use of the mask component - - - - - 1685acfc by Joeri de Gooijer at 2017-01-12T15:30:17+01:00 CHANNELMGR-1094 Formatting - - - - - 24f9ed8b by Joeri de Gooijer at 2017-01-12T16:08:24+01:00 CHANNELMGR-1094 Lift sidenav above mask and iframe and apply mask to sidenav - - - - - 4f344171 by Joeri de Gooijer at 2017-01-13T11:29:02+01:00 CHANNELMGR-1094 Removed unnecessary if statement - - - - - bb8511e0 by Joeri de Gooijer at 2017-01-13T11:29:18+01:00 CHANNELMGR-1094 Add component catalog service tests - - - - - 67a39481 by Joeri de Gooijer at 2017-01-13T13:13:49+01:00 CHANNELMGR-1094 Add component catalog service tests - - - - - 68a4a599 by Joeri de Gooijer at 2017-01-13T14:29:42+01:00 CHANNELMGR-1094 Merge branch 'bugfix/cm-overlay' into bugfix/cm-overlay-CHANNELMGR-1094 - - - - - 28b847f6 by Joeri de Gooijer at 2017-01-13T14:36:18+01:00 CHANNELMGR-1094 fix paths to svgs - - - - - 05ee6387 by Joeri de Gooijer at 2017-01-13T15:11:45+01:00 CHANNELMGR-1094 Merge branch 'bugfix/cm-overlay' into bugfix/cm-overlay-CHANNELMGR-1094 - - - - - 90d69c44 by Joeri de Gooijer at 2017-01-13T15:51:49+01:00 CHANNELMGR-1094 Use boolean in class - - - - - 41ccd2b9 by Joeri de Gooijer at 2017-01-13T15:52:23+01:00 CHANNELMGR-1094 Update styling of overlay - - - - - 58394c28 by Joeri de Gooijer at 2017-01-13T15:59:07+01:00 CHANNELMGR-1094 Hide menu links in add mode - - - - - f32b9cf9 by Mathijs den Burger at 2017-01-13T16:49:34+01:00 CHANNELMGR-1094 Remove unused isMasked() method - - - - - 4932c120 by Mathijs den Burger at 2017-01-13T16:49:41+01:00 CHANNELMGR-1094 Store ref to select component instead of its index - - - - - 025f06c8 by Mathijs den Burger at 2017-01-13T16:49:41+01:00 CHANNELMGR-1094 Improve parameter name - - - - - 1fcd0edc by Mathijs den Burger at 2017-01-13T16:49:41+01:00 CHANNELMGR-1094 Stop add mode in the same order as starting it - - - - - 777c465d by Mathijs den Burger at 2017-01-13T17:08:00+01:00 CHANNELMGR-1094 Load catalog when new channel is set Different channels can contain different catalogs. Loading the catalog in the sidenav won't work when a cross-channel link is clicked, since that won't reinstantiate the sidenav. - - - - - f665de48 by Mathijs den Burger at 2017-01-13T17:14:03+01:00 CHANNELMGR-1094 Clarify z-index logic - - - - - 25c1f1d6 by Mathijs den Burger at 2017-01-13T17:16:36+01:00 CHANNELMGR-1094 Fix width of container labels while dragging - - - - - 20b47af8 by Mathijs den Burger at 2017-01-13T17:26:36+01:00 CHANNELMGR-1094 Only add overlay click handler in add mode A single click handler also works, but relies on the fact that the overlay only sees pointer-events in add mode. The intent of the new code is more clear. - - - - - 23c0415d by Joeri de Gooijer at 2017-01-13T17:42:53+01:00 CHANNELMGR-1094 Reintegrate branch 'bugfix/cm-overlay-CHANNELMGR-1094' into bugfix/cm-overlay - - - - - 30 changed files: - frontend-ng/src/angularjs/api/catalog.service.js - frontend-ng/src/angularjs/channel/channel.controller.js - frontend-ng/src/angularjs/channel/channel.html - frontend-ng/src/angularjs/channel/channel.js - frontend-ng/src/angularjs/channel/channel.service.js - frontend-ng/src/angularjs/channel/channel.service.spec.js - frontend-ng/src/angularjs/channel/mask/mask.directive.js → frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.component.js - frontend-ng/src/angularjs/channel/hippoIframe/componentAdder/componentAdder.service.js → frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.js - + frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.controller.spec.js - + frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.html - frontend-ng/src/angularjs/channel/hippoIframe/componentAdder/componentAdder.js → frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.module.js - + frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.js - + frontend-ng/src/angularjs/channel/componentCatalog/componentCatalog.service.spec.js - − frontend-ng/src/angularjs/channel/hippoIframe/componentAdder/componentAdder.controller.js - frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.fixture.html → frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.fixture.html - frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.iframe.fixture.html → frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.iframe.fixture.html - frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js → frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.js - frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js → frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.spec.js - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.controller.js - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.js - frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.service.js - frontend-ng/src/angularjs/channel/hippoIframe/overlay.service.fixture.html → frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.fixture.html - frontend-ng/src/angularjs/channel/hippoIframe/overlay.service.iframe.fixture.html → frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.iframe.fixture.html - frontend-ng/src/angularjs/channel/hippoIframe/overlay.service.js → frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.js - frontend-ng/src/angularjs/channel/hippoIframe/overlay.service.spec.js → frontend-ng/src/angularjs/channel/hippoIframe/overlay/overlay.service.spec.js - frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.fixture.html → frontend-ng/src/angularjs/channel/hippoIframe/processing/hstCommentsProcessor.service.fixture.html - frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.js → frontend-ng/src/angularjs/channel/hippoIframe/processing/hstCommentsProcessor.service.js - frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.spec.js → frontend-ng/src/angularjs/channel/hippoIframe/processing/hstCommentsProcessor.service.spec.js - frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.fixture.html → frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.fixture.html The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/008adf41e9ce1bac89dcdb99653ed34b39077ee0...23c0415d41b1bf72fcf3e8945f930f58d559d1fb
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
