Skip to content

Commit

Permalink
(html) Use new sg-checkmark element
Browse files Browse the repository at this point in the history 
This fixes the issue of md-checkbox not usable in an md-menu in Firefox.

Fixes #3557
  • Loading branch information
@cgx
cgx committed Mar 1, 2016
1 parent 0b7824a commit 9b58693
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 45 deletions.
12 changes: 5 additions & 7 deletions UI/Templates/ContactsUI/UIxContactFoldersView.wox
View file
Expand Up @@ -259,13 +259,11 @@
</md-menu-item>
<md-menu-divider> <!-- divider --></md-menu-divider>
<md-menu-item >
<md-button>
<md-checkbox
ng-change="addressbook.sort(addressbook.selectedFolder.constructor.$query.sort)"
ng-model="addressbook.selectedFolder.constructor.$query.asc"
ng-true-value="0"
ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
</md-button>
<sg-checkmark
ng-change="addressbook.sort(addressbook.selectedFolder.constructor.$query.sort)"
ng-model="addressbook.selectedFolder.constructor.$query.asc"
sg-true-value="0"
sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
</md-menu-item>
</md-menu-content>
</md-menu>
Expand Down
8 changes: 3 additions & 5 deletions UI/Templates/MailerUI/UIxMailEditor.wox
View file
Expand Up @@ -164,11 +164,9 @@
</md-button>
<md-menu-content width="4">
<md-menu-item>
<md-button>
<md-checkbox ng-model="editor.message.editable.receipt">
<var:string label:value="Return Receipt"/>
</md-checkbox>
</md-button>
<sg-checkmark ng-model="editor.message.editable.receipt">
<var:string label:value="Return Receipt"/>
</sg-checkmark>
</md-menu-item>
<md-menu-item>
<md-button class="md-primary" ng-disabled="true"><var:string label:value="Priority"/></md-button>
Expand Down
25 changes: 12 additions & 13 deletions UI/Templates/MailerUI/UIxMailFolderTemplate.wox
View file
Expand Up @@ -29,14 +29,13 @@
</md-button>
<md-menu-content>
<md-menu-item>
<md-button>
<md-checkbox ng-model="app.search.subfolders"
ng-true-value="1"
ng-false-value="0">
<var:string label:value="Search subfolders"/>
</md-checkbox>
</md-button>
<sg-checkmark ng-model="app.search.subfolders"
sg-true-value="1"
sg-false-value="0">
<var:string label:value="Search subfolders"/>
</sg-checkmark>
</md-menu-item>
<md-menu-divider> <!-- divider --></md-menu-divider>
<md-menu-item>
<md-button ng-click="app.search.match='AND'">
<md-icon ng-class="{ 'icon-check': app.search.match == 'AND'}">
Expand Down Expand Up @@ -102,12 +101,12 @@
</md-menu-item>
<md-menu-divider> <!-- divider --></md-menu-divider>
<md-menu-item>
<md-button ng-click="mailbox.selectedFolder.$filter()">
<md-checkbox
ng-model="mailbox.service.$query.asc"
ng-true-value="0"
ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
</md-button>
<sg-checkmark
label:aria-label="Descending Order"
ng-model="mailbox.service.$query.asc"
ng-change="mailbox.selectedFolder.$filter()"
sg-true-value="0"
sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
</md-menu-item>
</md-menu-content>
</md-menu>
Expand Down
37 changes: 17 additions & 20 deletions UI/Templates/SchedulerUI/UIxCalMainView.wox
View file
Expand Up @@ -362,12 +362,11 @@
</md-menu-item>
<md-menu-divider ng-if="list.componentType == 'tasks'"><!-- divider --></md-menu-divider>
<md-menu-item ng-if="list.componentType == 'tasks'">
<md-button ng-click="list.component.$filter(list.componentType)">
<md-checkbox
ng-model="list.component.$queryTasks.show_completed"
ng-true-value="1"
ng-false-value="0"> <var:string label:value="Show completed tasks"/></md-checkbox>
</md-button>
<sg-checkmark
ng-change="list.component.$filter(list.componentType)"
ng-model="list.component.$queryTasks.show_completed"
sg-true-value="1"
sg-false-value="0"> <var:string label:value="Show completed tasks"/></sg-checkmark>
</md-menu-item>
</md-menu-content>
</md-menu>
Expand Down Expand Up @@ -433,22 +432,20 @@
</md-menu-item>
<md-menu-divider><!-- divider --></md-menu-divider>
<md-menu-item ng-if="list.componentType == 'events'">
<md-button>
<md-checkbox class="sg-no-wrap"
ng-change="list.component.$filter(list.componentType)"
ng-model="list.component.$queryEvents.asc"
ng-true-value="0"
ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
</md-button>
<sg-checkmark
class="sg-no-wrap"
ng-change="list.component.$filter(list.componentType)"
ng-model="list.component.$queryEvents.asc"
sg-true-value="0"
sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
</md-menu-item>
<md-menu-item ng-if="list.componentType == 'tasks'">
<md-button>
<md-checkbox class="sg-no-wrap"
ng-change="list.component.$filter(list.componentType)"
ng-model="list.component.$queryTasks.asc"
ng-true-value="0"
ng-false-value="1"><var:string label:value="Descending Order"/></md-checkbox>
</md-button>
<sg-checkmark
class="sg-no-wrap"
ng-change="list.component.$filter(list.componentType)"
ng-model="list.component.$queryTasks.asc"
sg-true-value="0"
sg-false-value="1"><var:string label:value="Descending Order"/></sg-checkmark>
</md-menu-item>
</md-menu-content>
</md-menu>
Expand Down

0 comments on commit 9b58693

Please sign in to comment.