| author | Sam Foster <sfoster@mozilla.com> |
| Fri, 31 Jan 2014 13:56:42 -0800 | |
| changeset 166377 | b670b20cfcc7469605e66567ce5f03e29863876d |
| parent 166376 | 7e577607c4046b3fd5cf080d582e01baebf47608 |
| child 166378 | d02efae4db3a863c2d0ffaa479c735a128ca9bf7 |
| push id | 26118 |
| push user | ryanvm@gmail.com |
| push date | Sat, 01 Feb 2014 02:04:37 +0000 |
| treeherder | mozilla-central@cee541ab3322 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| reviewers | rsilveira |
| bugs | 964149 |
| milestone | 29.0a1 |
| first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
| last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/browser/metro/base/content/bindings/grid.xml +++ b/browser/metro/base/content/bindings/grid.xml @@ -803,17 +803,17 @@ </method> <method name="bendItem"> <parameter name="aItem"/> <parameter name="aEvent"/> <body><![CDATA[ // apply the transform to the contentBox element of the item let bendNode = this.isItem(aItem) ? aItem._contentBox : null; - if (!bendNode) + if (!bendNode || aItem.hasAttribute("bending")) return; let event = aEvent; let rect = bendNode.getBoundingClientRect(); let angle; let x = (event.clientX - rect.left) / rect.width; let y = (event.clientY - rect.top) / rect.height; let perspective = '450px'; @@ -867,16 +867,17 @@ </implementation> <handlers> <!-- item bend effect handlers --> <handler event="mousedown" button="0" phase="capturing" action="this.bendItem(event.target, event)"/> <handler event="touchstart" action="this.bendItem(event.target, event.touches[0])"/> <handler event="mouseup" button="0" action="this.unbendItem(event.target)"/> <handler event="mouseout" button="0" action="this.unbendItem(event.target)"/> <handler event="touchend" action="this.unbendItem(event.target)"/> + <handler event="touchcancel" action="this.unbendItem(event.target)"/> <!-- /item bend effect handler --> <handler event="context-action"> <![CDATA[ // context-action is an event fired by the appbar typically // which directs us to do something to the selected tiles switch (event.action) { case "clear":