Joeri de Gooijer pushed to branch bugfix/CHANNELMGR-925 at cms-community / 
hippo-addon-channel-manager


Commits:
ceab95d1 by Joeri de Gooijer at 2016-10-18T16:32:35+02:00
CHANNELMGR-925 Add functional folder structure

hippoIframe was quite a big folder. To reason better about the function
areas of the iframe and its overlay its now split up in DragDrop,
Scaling, Scrolling, Processing, and the Overlay.

- - - - -
83fb1c0f by Joeri de Gooijer at 2016-10-18T16:54:00+02:00
CHANNELMGR-925 Improve markup layout

- - - - -


18 changed files:

- 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.html
- frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.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
- frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.js → 
frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.spec.js → 
frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.spec.js
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html → 
frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.fixture.html
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.spec.js
- frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.fixture.html → 
frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.fixture.html
- frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.js
- frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.spec.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.spec.js


Changes:

=====================================
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.fixture.html → 
frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.fixture.html
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.fixture.html
+++ 
b/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
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.iframe.fixture.html
+++ 
b/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
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.js
+++ b/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
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop.service.spec.js
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/dragDrop/dragDrop.service.spec.js


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.html
@@ -37,12 +37,16 @@
             <div ng-repeat="component in container.getComponents()" 
class="qa-component">
               <overlay-element class="overlay-element-component"
                                layout="row"
-                               structure-element="component"
-                               ng-class="{ 
'overlay-element-component-visible': !iframe.isDragging(), 'overlay-permeable': 
iframe.isDraggingOrClicking() }"
-                               ng-mousedown="iframe.startDragOrClick($event, 
component)">
+                               ng-class="{
+                                 'overlay-element-component-visible': 
!iframe.isDragging(),
+                                 'overlay-permeable': 
iframe.isDraggingOrClicking(),
+                               }"
+                               ng-mousedown="iframe.startDragOrClick($event, 
component)"
+                               structure-element="component">
               </overlay-element>
             </div>
           </div>
+
           <div ng-repeat="contentLink in iframe.getContentLinks()">
             <overlay-element structure-element="contentLink">
               <md-button class="overlay-element-fab 
overlay-element-fab-content-link md-fab md-mini md-hue-2 qa-content-link"
@@ -55,6 +59,7 @@
               </md-button>
             </overlay-element>
           </div>
+
           <div ng-repeat="editMenuLink in iframe.getEditMenuLinks()">
             <overlay-element structure-element="editMenuLink">
               <md-button class="overlay-element-fab md-fab md-mini md-hue-2 
qa-edit-menu-link"
@@ -68,8 +73,8 @@
               </md-button>
             </overlay-element>
           </div>
-        </div>
 
+        </div>
       </div>
     </div>
     <div class="channel-dragula-mirror cm-scale"></div>


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/hippoIframe.js
@@ -19,11 +19,11 @@ import { componentAdderModule } from 
'./componentAdder/componentAdder';
 import { hippoIframe } from './hippoIframe.directive';
 import { HippoIframeCtrl } from './hippoIframe.controller';
 import { HippoIframeService } from './hippoIframe.service';
-import { HstCommentsProcessorService } from './hstCommentsProcessor.service';
-import { LinkProcessorService } from './linkProcessor.service';
-import { ScalingService } from './scaling.service';
-import { ScrollService } from './scroll.service';
-import { DragDropService } from './dragDrop.service';
+import { HstCommentsProcessorService } from 
'./processing/hstCommentsProcessor.service';
+import { LinkProcessorService } from './processing/linkProcessor.service';
+import { ScalingService } from './scaling/scaling.service';
+import { ScrollService } from './scrolling/scroll.service';
+import { DragDropService } from './dragDrop/dragDrop.service';
 
 export const channelHippoIframeModule = angular
   .module('hippo-cm.channel.hippoIframe', [


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.fixture.html
 → 
frontend-ng/src/angularjs/channel/hippoIframe/processing/hstCommentsProcessor.service.fixture.html
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.fixture.html
+++ 
b/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
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.js
+++ 
b/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
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/hstCommentsProcessor.service.spec.js
+++ 
b/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
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.fixture.html
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.fixture.html


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.js → 
frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.js
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.js


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.spec.js → 
frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.spec.js
=====================================
--- 
a/frontend-ng/src/angularjs/channel/hippoIframe/linkProcessor.service.spec.js
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/processing/linkProcessor.service.spec.js


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html → 
frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.fixture.html
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.fixture.html
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.fixture.html


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.js


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scaling.service.spec.js
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/scaling/scaling.service.spec.js


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.fixture.html → 
frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.fixture.html
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.fixture.html
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.fixture.html


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.js
+++ b/frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.js


=====================================
frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.spec.js → 
frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/hippoIframe/scroll.service.spec.js
+++ 
b/frontend-ng/src/angularjs/channel/hippoIframe/scrolling/scroll.service.spec.js



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/bb735c2840f79f1928fc03001aa564a5918c0a0a...83fb1c0f59d7292343730daa9ffd6e0bfbe07461
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to