Podwyższenie wymaganej wersji biblioteki librarian do 1.2.6.

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

diff --git a/project/static/js/app.js b/project/static/js/app.js
index 7586f3f..fde1539 100644 (file)
--- a/project/static/js/app.js
+++ b/project/static/js/app.js
@@ -3,6 +3,14 @@ var editor;
 var panel_hooks;
 
 
 var panel_hooks;
 
 

+// prevent a console.log from blowing things up if we are on a browser that
+// does not support it
+if (typeof console === 'undefined') {
+  window.console = {} ;
+  console.log = console.info = console.warn = console.error = function(){};
+}
+
+

 (function(){
   // Classes
   var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;
 (function(){
   // Classes
   var initializing = false, fnTest = /xyz/.test(function(){xyz;}) ? /\b_super\b/ : /.*/;


@@ -41,20 +49,21 @@ var panel_hooks;
 
   this.render_template = function render_template(str, data){
     // Figure out if we're getting a template, or if we need to
 
   this.render_template = function render_template(str, data){
     // Figure out if we're getting a template, or if we need to

-    // load the template - and be sure to cache the result.
+    // load the template - and be sure to cache the result.    

     var fn = !/^[\d\s-_]/.test(str) ?
       cache[str] = cache[str] ||
         render_template(document.getElementById(str).innerHTML) :
 
       // Generate a reusable function that will serve as a template
       // generator (and which will be cached).
     var fn = !/^[\d\s-_]/.test(str) ?
       cache[str] = cache[str] ||
         render_template(document.getElementById(str).innerHTML) :
 
       // Generate a reusable function that will serve as a template
       // generator (and which will be cached).

+      

       new Function("obj",
         "var p=[],print=function(){p.push.apply(p,arguments);};" +
 
         // Introduce the data as local variables using with(){}
         "with(obj){p.push('" +
 
       new Function("obj",
         "var p=[],print=function(){p.push.apply(p,arguments);};" +
 
         // Introduce the data as local variables using with(){}
         "with(obj){p.push('" +
 

-        // Convert the template into pure JavaScript
+        // Convert the template into pure JavaScript       

         str
           .replace(/[\r\t\n]/g, " ")
           .split("<%").join("\t")
         str
           .replace(/[\r\t\n]/g, " ")
           .split("<%").join("\t")


@@ -70,6 +79,7 @@ var panel_hooks;
   };
 })();
 
   };
 })();
 

+

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


@@ -97,137 +107,79 @@ 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 (observer in this.observers[event]) {
-        observer.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][observer] = 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 {

-      delete this.observers[event][observer];
+      // console.log('Remove observer', observer.description(), 'from', this.description(), '[', property, ']');
+      delete this._observers[property][observer.guid()];

     }
     return this;
     }
     return this;

-  }
-});
-
-
-var XMLModel = Model.extend({
-  parent: null,
-  data: null,
-  serverURL: null,
-  
-  init: function(parent, serverURL) {
-    this.parent = parent;
-    this.serverURL = serverURL;
-  },
-  
-  reload: function() {
-    $.ajax({
-      url: this.serverURL,
-      dataType: 'text',
-      success: this.reloadSucceeded.bind(this)
-    });

   },
   
   },
   

-  reloadSucceeded: function(data) {
-    this.data = data;
-    this.signal('reloaded');
-  },
-})
-
-var DocumentModel = Model.extend({
-  data: null, // name, text_url, latest_rev, latest_shared_rev, parts_url, dc_url, size
-  xml: null,
-  html: null,
-  
-  init: function() {},
-  
-  getData: function(callback) {
-    console.log('get:', documentsUrl + fileId);
-    $.ajax({
-      cache: false,
-      url: documentsUrl + fileId,
-      dataType: 'json',
-      success: this.successfulGetData.bind(this, callback)
-    });
-  },
-  
-  successfulGetData: function(callback, data) {
-    this.data = data;
-    this.signal('changed');
-    if (callback) {
-      (callback.bind(this))(data);
+  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;

   },
   
   },
   

-  load: function(key) {
-    if (!this.data) {
-      this.getData(function() { this.load(key); }.bind(this));
-    } else {
-      console.log('load', key, this.data[key + 'url']);
-      $.ajax({
-        url: this.data[key + '_url'],
-        dataType: 'text',
-        success: this.loadSucceeded.bind(this, key)
-      });
+  guid: function() {
+    if (!this._guid) {
+      this._guid = ('editor-' + Editor.Object._lastGuid++);

     }
     }

+    return this._guid;

   },
   
   },
   

-  loadSucceeded: function(key, data) {
-    console.log('loadSucceeded', key, data);
-    this.set(key, data);
+  get: function(property) {
+    return this[property];

   },
   
   },
   

-  get: function(key) {
-    console.log(this[key]);
-    if (this[key]) {
-      return this[key]
-    } else {
-      this.load(key);
-      return '';
+  set: function(property, value) {
+    if (this[property] != value) {
+      this[property] = value;
+      this.notifyObservers(property);

     }
     }

+    return this;

   },
   
   },
   

-  set: function(key, value) {
-    this[key] = value;
-    this.signal(key + '-changed');
-    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 = [];