diff options
author | Lorenzo Tilve <ltilve@igalia.com> | 2021-04-06 11:55:29 +0200 |
---|---|---|
committer | Lorenzo Tilve <ltilve@igalia.com> | 2021-04-06 11:58:48 +0200 |
commit | 48970567f1943fb70ef1526827c21548d23695e7 (patch) | |
tree | 52e79475771d887ea6bdc52fd5f1349edcc5ba28 | |
parent | 921933cf21de6b874c2b8e12b8416176a74018ce (diff) |
Disable dragging and zoom events on app imagesmarlin_12.92.0marlin_12.91.0marlin_12.90.1marlin_12.90.0marlin/12.92.0marlin/12.91.0marlin/12.90.1marlin/12.90.0lamprey_11.92.0lamprey_11.91.0lamprey/11.92.0lamprey/11.91.012.92.012.91.012.90.112.90.011.92.011.91.0
We identified that part of the problems that were triggering the
race condition were related with starting the drag of webapp
images. Disabling those events, and also removing href
link to avoid displaying draggable link.
Bug-AGL: SPEC-3786
Signed-off-by: Lorenzo Tilve <ltilve@igalia.com>
Change-Id: I4da1e0ee0c86812f5ecb7b83a70a2a3e27093b3d
-rw-r--r-- | src/styles/main.scss | 8 | ||||
-rw-r--r-- | src/templates/apps.template.html | 4 | ||||
-rw-r--r-- | src/templates/time.template.html | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/styles/main.scss b/src/styles/main.scss index b89ee6f..a09d4e5 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -24,6 +24,12 @@ body { color: map-get($colors, font); margin: 0; + img { + user-select: none !important; + touch-action: none; + pointer-events: none; + } + a { color: map-get($colors, font); text-decoration: none; @@ -148,4 +154,4 @@ body { background: white; font-size: 1.5rem; } -}
\ No newline at end of file +} diff --git a/src/templates/apps.template.html b/src/templates/apps.template.html index 9916e2a..bcf2968 100644 --- a/src/templates/apps.template.html +++ b/src/templates/apps.template.html @@ -1,5 +1,5 @@ {{ #apps }} - <a href="#" class="button" id="app-{{id}}" app-id="{{ id }}" onclick="apps.start('{{id}}');"> + <a class="button" dragable="false" id="app-{{id}}" app-id="{{ id }}" onclick="apps.start('{{id}}');"> <div class="icon {{ icon }}"> </div> @@ -7,4 +7,4 @@ {{ name }} </div> </a> -{{ /apps }}
\ No newline at end of file +{{ /apps }} diff --git a/src/templates/time.template.html b/src/templates/time.template.html index 663c8e5..c7dad96 100644 --- a/src/templates/time.template.html +++ b/src/templates/time.template.html @@ -8,7 +8,7 @@ {{ #weather }} {{ #showTemperature }} <div class="temperature weatherItem"> - <img src="http://openweathermap.org/img/wn/{{ weather.weather.0.icon }}.png"> + <img dragable="false" src="http://openweathermap.org/img/wn/{{ weather.weather.0.icon }}.png"> {{ weather.main.temp }}ºF </div> {{ /showTemperature }} @@ -43,4 +43,4 @@ No weather </div> {{ /weather }} -</div>
\ No newline at end of file +</div> |