Mathijs den Burger pushed to branch master at cms-community /
hippo-addon-channel-manager
Commits:
343d498b by Arthur Bogaart at 2016-06-03T13:55:16+02:00
CHANNELMGR-715 Add title attribute to back/close button
- - - - -
681509b5 by Arthur Bogaart at 2016-06-06T11:24:50+02:00
CHANNELMGR-715 Use data- prefix for title attribute
To prevent the 'title' attribute of the subpage directive serving a second
purpose (showing a native browser tooltip in the toolbar) we prefix it with
data-.
- - - - -
3a2137f7 by Mathijs den Burger at 2016-06-06T15:39:33+02:00
CHANNELMGR-715 Reintegrate bugfix/CHANNELMGR-715
- - - - -
9 changed files:
- frontend-ng/src/angularjs/channel/actions/settings/settings.html
- frontend-ng/src/angularjs/channel/changes/manageChanges.html
- frontend-ng/src/angularjs/channel/menu/editor.html
- frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
- frontend-ng/src/angularjs/channel/page/actions/create/create.html
- frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
- frontend-ng/src/angularjs/channel/page/actions/move/move.html
- frontend-ng/src/angularjs/channel/subpage/toolbar.html
- frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
Changes:
=====================================
frontend-ng/src/angularjs/channel/actions/settings/settings.html
=====================================
--- a/frontend-ng/src/angularjs/channel/actions/settings/settings.html
+++ b/frontend-ng/src/angularjs/channel/actions/settings/settings.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ channelSettings.subpageTitle }}"
+ data-title="{{ channelSettings.subpageTitle }}"
on-back="channelSettings.onDone()"
mode="cancel">
</subpage-toolbar>
=====================================
frontend-ng/src/angularjs/channel/changes/manageChanges.html
=====================================
--- a/frontend-ng/src/angularjs/channel/changes/manageChanges.html
+++ b/frontend-ng/src/angularjs/channel/changes/manageChanges.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ 'SUBPAGE_CHANGEMANAGEMENT_TITLE' | translate }}"
+ data-title="{{ 'SUBPAGE_CHANGEMANAGEMENT_TITLE' | translate
}}"
on-back="changeMan.goBack()">
</subpage-toolbar>
=====================================
frontend-ng/src/angularjs/channel/menu/editor.html
=====================================
--- a/frontend-ng/src/angularjs/channel/menu/editor.html
+++ b/frontend-ng/src/angularjs/channel/menu/editor.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ 'SUBPAGE_MENU_EDITOR_TITLE' | translate }}"
+ data-title="{{ 'SUBPAGE_MENU_EDITOR_TITLE' | translate }}"
on-back="menuEditor.onBack()">
</subpage-toolbar>
=====================================
frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/copy/copy.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ pageCopy.subpageTitle }}"
+ data-title="{{ pageCopy.subpageTitle }}"
on-back="pageCopy.onDone()"
mode="cancel">
</subpage-toolbar>
=====================================
frontend-ng/src/angularjs/channel/page/actions/create/create.html
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/create/create.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/create/create.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ 'SUBPAGE_PAGE_CREATE_TITLE' | translate }}"
+ data-title="{{ 'SUBPAGE_PAGE_CREATE_TITLE' | translate }}"
on-back="pageCreate.onDone()"
mode="cancel">
</subpage-toolbar>
=====================================
frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/edit/edit.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ pageEdit.subpageTitle }}"
+ data-title="{{ pageEdit.subpageTitle }}"
on-back="pageEdit.onDone()"
mode="cancel">
</subpage-toolbar>
@@ -77,4 +77,4 @@
</md-button>
</div>
</form>
-</subpage-content>
\ No newline at end of file
+</subpage-content>
=====================================
frontend-ng/src/angularjs/channel/page/actions/move/move.html
=====================================
--- a/frontend-ng/src/angularjs/channel/page/actions/move/move.html
+++ b/frontend-ng/src/angularjs/channel/page/actions/move/move.html
@@ -15,7 +15,7 @@
-->
<subpage-toolbar flex="none"
- title="{{ pageMove.subpageTitle }}"
+ data-title="{{ pageMove.subpageTitle }}"
on-back="pageMove.onDone()"
mode="cancel">
</subpage-toolbar>
@@ -65,4 +65,4 @@
</md-button>
</div>
</form>
-</subpage-content>
\ No newline at end of file
+</subpage-content>
=====================================
frontend-ng/src/angularjs/channel/subpage/toolbar.html
=====================================
--- a/frontend-ng/src/angularjs/channel/subpage/toolbar.html
+++ b/frontend-ng/src/angularjs/channel/subpage/toolbar.html
@@ -18,6 +18,7 @@
<div class="md-toolbar-tools">
<md-button class="qa-button-back md-icon-button"
aria-label="{{ toolbar.ariaLabel }}"
+ title="{{ toolbar.ariaLabel }}"
ng-click="onBack()">
<md-icon md-svg-src="{{ toolbar.icon }}"></md-icon>
</md-button>
=====================================
frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
=====================================
--- a/frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
+++ b/frontend-ng/src/angularjs/channel/subpage/toolbar.spec.js
@@ -41,7 +41,7 @@ describe('SubpageToolbar', () => {
$scope.onBack = jasmine.createSpy('onBack');
$scope.title = 'testTitle';
$scope.mode = mode;
- $element = angular.element('<subpage-toolbar title="{{title}}"
on-back="onBack()" mode="{{mode}}"> </subpage-toolbar>');
+ $element = angular.element('<subpage-toolbar data-title="{{title}}"
on-back="onBack()" mode="{{mode}}"> </subpage-toolbar>');
$compile($element)($scope);
$scope.$digest();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/eaadfde474bd04169a1b9ffc58e93afc7696a772...3a2137f7136aeb87e7abe18acb2471489b677057
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
