Arthur Bogaart pushed to branch master at cms-community / 
hippo-addon-channel-manager


Commits:
40422979 by Arthur Bogaart at 2018-02-12T13:59:56+01:00
CHANNELMGR-1654 Replace element ID with className

Replaced element ID 'nameInputElement' with
className 'name-input-element'.

- - - - -
72f48ea5 by Arthur Bogaart at 2018-02-12T14:03:20+01:00
CHANNELMGR-1654 Hide clear-input icon in MS-Edge

MS Edge shows a native X icon to clear the value of an input field. This
overlaps  with our edit/regenerate icons. To fix the issue, the X icon is
hidden using a vendor-specific CSS rule.

- - - - -
df4c10de by Arthur Bogaart at 2018-02-12T14:04:16+01:00
CHANNELMGR-1654 Fix eslint error in spec

- - - - -
2ba0eb05 by Arthur Bogaart at 2018-02-12T14:08:25+01:00
CHANNELMGR-1654 Reintegrate bugfix/CHANNELMGR-1654

- - - - -


5 changed files:

- frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.js
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.spec.js
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
- 
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.scss


Changes:

=====================================
frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
=====================================
--- a/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
+++ b/frontend-ng/src/app/channel/hippoIframe/overlay/overlay.service.spec.js
@@ -968,7 +968,6 @@ describe('OverlayService', () => {
             done();
           });
         });
-
       });
     });
 


=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.js
=====================================
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.js
@@ -23,7 +23,7 @@ class NameUrlFieldsController {
     this.createContentService = CreateContentService;
     this.isManualUrlMode = false;
     this.isUrlUpdating = false;
-    this.nameInputField = $element.find('#nameInputElement');
+    this.nameInputField = $element.find('.name-input-element');
     this.updateUrlThrottle = throttle(() => this.updateUrl(), 
URL_UPDATE_DELAY, true);
   }
 


=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.spec.js
=====================================
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.spec.js
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.controller.spec.js
@@ -37,7 +37,7 @@ describe('NameUrlFields', () => {
     });
 
     $rootScope.$new();
-    element = angular.element('<form><input ng-model="$ctrl.nameField" 
name="name" placeholder="Document name" required autocomplete="off" 
id="nameInputElement"></form>');
+    element = angular.element('<form><input ng-model="$ctrl.nameField" 
name="name" placeholder="Document name" required autocomplete="off" 
class="name-input-element"></form>');
     component = $componentController('nameUrlFields', {
       $element: element,
     });


=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
=====================================
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.html
@@ -17,7 +17,7 @@
 <ng-form name="$ctrl.form" novalidate>
   <!-- Document name field -->
   <md-input-container class="create-content-field qa-name-field">
-    <input id="nameInputElement"
+    <input class="name-input-element"
            name="nameField"
            placeholder="Document name"
            ng-model="$ctrl.nameField"
@@ -34,7 +34,8 @@
   <div class="field">
 
     <md-input-container class="create-content-field qa-url-field">
-      <input name="url"
+      <input class="url-input-element"
+             name="url"
              placeholder="URL"
              type="text"
              ng-model="$ctrl.urlField"


=====================================
frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.scss
=====================================
--- 
a/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.scss
+++ 
b/frontend-ng/src/app/channel/sidePanels/rightSidePanel/createContent/nameUrlFields/nameUrlFields.scss
@@ -24,6 +24,11 @@ name-url-fields {
     right: 0;
     top: -2px;
   }
+
+  // Hide the 'clear field' icon in Edge because it overlaps with the 
edit/regenerate icon
+  .url-input-element::-ms-clear { //sass-lint:disable-line no-vendor-prefixes
+    display: none;
+  }
 }
 
 .name-url-fields-dialog {



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/a66e84935714f0b8c197a0eef0fb978f6cedf913...2ba0eb05c779defe7f0e52029f97916d064b78eb

---
View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/a66e84935714f0b8c197a0eef0fb978f6cedf913...2ba0eb05c779defe7f0e52029f97916d064b78eb
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn

Reply via email to