From 539afb8d97dbfcff1dab39277fe0b0e73d32e7ea Mon Sep 17 00:00:00 2001
From: Stefan Kienzle <stefankienzle.de@gmail.com>
Date: Fri, 13 Sep 2013 16:18:18 +0200
Subject: [PATCH] Some small changes in fabric.Observable

---
 src/mixins/observable.mixin.js | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/mixins/observable.mixin.js b/src/mixins/observable.mixin.js
index 49ba83be..ba191f35 100644
--- a/src/mixins/observable.mixin.js
+++ b/src/mixins/observable.mixin.js
@@ -6,13 +6,13 @@
    * @param {Function} handler
    */
   function _removeEventListener(eventName, handler) {
-    if (this.__eventListeners[eventName]) {
-      if (handler) {
-        fabric.util.removeFromArray(this.__eventListeners[eventName], handler);
-      }
-      else {
-        this.__eventListeners[eventName].length = 0;
-      }
+    if (!this.__eventListeners[eventName]) return;
+
+    if (handler) {
+      fabric.util.removeFromArray(this.__eventListeners[eventName], handler);
+    }
+    else {
+      this.__eventListeners[eventName].length = 0;
     }
   }
 
@@ -56,9 +56,8 @@
    * @chainable
    */
   function stopObserving(eventName, handler) {
-    if (!this.__eventListeners) {
-      this.__eventListeners = { };
-    }
+    if (!this.__eventListeners) return;
+
     // one object with key/value pairs was passed
     if (arguments.length === 1 && typeof arguments[0] === 'object') {
       for (var prop in eventName) {
@@ -82,9 +81,8 @@
    * @chainable
    */
   function fire(eventName, options) {
-    if (!this.__eventListeners) {
-      this.__eventListeners = { };
-    }
+    if (!this.__eventListeners) return;
+
     var listenersForEvent = this.__eventListeners[eventName];
     if (!listenersForEvent) return;
     for (var i = 0, len = listenersForEvent.length; i < len; i++) {