Zmiana jednego komentarza i poprawki błędów wskazanych przez jslint.

[redakcja.git] / project / static / js / app.js

diff --git a/project/static/js/app.js b/project/static/js/app.js
index 2530ee1..e8875c9 100644 (file)
--- a/project/static/js/app.js
+++ b/project/static/js/app.js
@@ -70,6 +70,7 @@ var panel_hooks;
   };
 })();
 
   };
 })();
 

+

 (function() {
   var slice = Array.prototype.slice;
   
 (function() {
   var slice = Array.prototype.slice;
   


@@ -97,106 +98,80 @@ var panel_hooks;
   }
   
 })();
   }
   
 })();

- 
-var panels = [];

 
 

-var documentsUrl = '/api/documents/';

 
 

+var Editor = Editor || {};

 
 

-var Model = Class.extend({
-  observers: {},
+// Obiekt implementujący wzorzec KVC/KVO
+Editor.Object = Class.extend({
+  _className: 'Editor.Object',
+  _observers: {},
+  _guid: null,

   
   

-  init: function() {},
+  init: function() {
+    this._observers = {};
+  },

   
   

-  signal: function(event, data) {
-    console.log('signal', this, event, data);
-    if (this.observers[event]) {
-      for (var i=0; i < this.observers[event].length; i++) {
-        this.observers[event][i].handle(event, data);
-      };
-    };
-    return this;
+  description: function() {
+    return this._className + '(guid = ' + this.guid() + ')';

   },
   
   },
   

-  addObserver: function(observer, event) {
-    if (!this.observers[event]) {
-      this.observers[event] = [];
+  addObserver: function(observer, property, callback) {
+    // console.log('Add observer', observer.description(), 'to', this.description(), '[', property, ']');
+    if (!this._observers[property]) {
+      this._observers[property] = {}

     }
     }

-    this.observers[event].push(observer);
+    this._observers[property][observer.guid()] = callback;

     return this;
   },
   
     return this;
   },
   

-  removeObserver: function(observer, event) {
-    if (!event) {
-      for (e in this.observers) {
-        this.removeObserver(observer, e);
+  removeObserver: function(observer, property) {
+    if (!property) {
+      for (var property in this._observers) {
+        this.removeObserver(observer, property)

       }
     } else {
       }
     } else {

-      for (var i=0; i < this.observers[event].length; i++) {
-        if (this.observers[event][i] === observer) {
-          this.observers[event].splice(i, 1);
-        }
-      }
+      // console.log('Remove observer', observer.description(), 'from', this.description(), '[', property, ']');
+      delete this._observers[property][observer.guid()];

     }
     return this;
     }
     return this;

-  }
-})
-
-var DocumentModel = Model.extend({
-  data: null, // name, text_url, latest_rev, latest_shared_rev, parts_url, dc_url, size
-  xml: '',
-  html: '',
-  
-  init: function() {},
+  },

   
   

-  getData: function(callback) {
-    console.log('get:', documentsUrl + fileId);
-    $.ajax({
-      cache: false,
-      url: documentsUrl + fileId,
-      dataType: 'json',
-      success: this.successfulGetData.bind(this, callback)
-    });
+  notifyObservers: function(property) {
+    var currentValue = this[property];
+    for (var guid in this._observers[property]) {
+      // console.log(this._observers[property][guid]);
+      // console.log('Notifying', guid, 'of', this.description(), '[', property, ']');
+      this._observers[property][guid](property, currentValue, this);
+    }
+    return this;

   },
   
   },
   

-  successfulGetData: function(callback, data) {
-    this.data = data;
-    this.signal('changed');
-    if (callback) {
-      (callback.bind(this))(data);
+  guid: function() {
+    if (!this._guid) {
+      this._guid = ('editor-' + Editor.Object._lastGuid++);

     }
     }

+    return this._guid;

   },
   
   },
   

-  getXML: function(callback) {
-    this.signal('xml-freeze');
-    if (!this.data) {
-      this.getData(this.getXML);
-    } else {
-      console.log('getXML:', this.data.text_url);
-      $.ajax({
-        cache: false,
-        url: this.data.text_url,
-        dataType: 'text',
-        success: this.successfulGetXML.bind(this, callback)
-      });
-    };
+  get: function(property) {
+    return this[property];

   },
   
   },
   

-  successfulGetXML: function(callback, data) {
-    if (data != this.xml) {
-      this.xml = data;
-      this.signal('changed');
-      this.signal('xml-changed');
+  set: function(property, value) {
+    if (this[property] != value) {
+      this[property] = value;
+      this.notifyObservers(property);

     }
     }

-    this.signal('xml-unfreeze');
+    return this;
+  },
+  
+  dispose: function() {
+    delete this._observers;

   }
 });
 
   }
 });
 

-var leftPanelView, rightPanelContainer, doc;
+Editor.Object._lastGuid = 0;

 
 

-$(function() {
-  doc = new DocumentModel();
-  var splitView = new SplitView('#splitview', doc);
-  leftPanelView = new PanelContainerView('#left-panel-container', doc);
-  rightPanelContainer = new PanelContainerView('#right-panel-container', doc);
-});
+
+var panels = [];