Commit e87c0fd5 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Usa animate.css para notificaciones y marcadores 

Actualiza submódulo.
Aplica actualización de prefijo.
Refactoriza levemente.
Cambia animación usada en marcadores para evitar movimiento.
parent bf69a0b5

public/javascript/redmic/modules/map/layer/_AnimateMarker.js

+3 −4
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ define([ 
		constructor: function(args) {



			this.config = {

				animatedMarkerClass: 'animated',

				markerAnimationClass: 'bounce'

				animatedMarkerClass: 'animate__animated',

				markerAnimationClass: 'animate__flash'

			};



			lang.mixin(this, this.config, args);
@@ -43,10 +43,9 @@ define([ 


			animatedContainer.addEventListener('animationend', lang.hitch(this, function(icon, container) {



				delete this._markerAnimationHandler;

				put(container.parentNode, icon);

				put('!', container);

			}, markerIcon, animatedContainer), false);

			}, markerIcon, animatedContainer));

		}

	});

});

public/javascript/redmic/modules/notification/Notification.js

+20 −20
Original line number Diff line number Diff line 
define([

	"dojo/_base/declare"

	, "dojo/on"

	, "dojo/_base/lang"

	, "redmic/modules/base/_Module"

	, "redmic/modules/base/_Show"
@@ -10,7 +9,6 @@ define([ 
	, "put-selector/put"

], function(

	declare

	, on

	, lang

	, _Module

	, _Show
@@ -67,7 +65,9 @@ define([ 
						title: "remove",

						returnItem: true

					}]

					}*/]

				}*/],

				notificationIconClass: 'fa.fa-bell.animate__animated',

				notificationIconAnimationClass: 'animate__swing'

			};



			lang.mixin(this, this.config, args);
@@ -119,7 +119,7 @@ define([ 
			this.inherited(arguments);



			put(this.domNode, ".notification");

			this.iconNode = put(this.domNode, "i.fa.fa-bell");

			this.iconNode = put(this.domNode, 'i.' + this.notificationIconClass);

			this.spanNode = put(this.domNode, "span.hidden", 0);



			this.iconNode.addEventListener('animationend', lang.hitch(this, this._removeAnimated));
@@ -207,7 +207,7 @@ define([ 
				if (!notification.notCount && (!notification.id || !this.alertWithId[notification.id])) {

					this.alertWithId[notification.id] = notification.type;

					this._changeCountNotification(true);

					this.iconNode.classList.add("swing");

					this.iconNode.classList.add(this.notificationIconAnimationClass);

				} else {

					obj.data.notCount = true;

				}
@@ -221,7 +221,7 @@ define([ 


		_removeAnimated: function() {



			this.iconNode.classList.remove("swing");

			this.iconNode.classList.remove(this.notificationIconAnimationClass);

		},



		_subDecrementCountNotification: function(obj) {

stylesheets @ f3764823

Compare 46726f1b to f3764823
Original line number Diff line number Diff line 
Subproject commit 46726f1bebd97c272a91db721d93f63bd218b86b
 
Subproject commit f376482372e188589c63d82b40d8d768795b268e