metadataplayer: comparison src/js/model.js

Mercurial Mercurial > metadataplayer / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

src/js/model.js

branch	new-model
changeset 868	a525cc2214e7
parent 866	3bf7aa8216e5
child 870	2c025db10a10

equal deleted inserted replaced

-:3bf7aa8216e5
+:a525cc2214e7
 /* model.js is where data is stored in a standard form, whatever the serializer */
 IriSP.Model = {
-SOURCE_STATUS_EMPTY : 0,
+_SOURCE_STATUS_EMPTY : 0,
-SOURCE_STATUS_WAITING : 1,
+_SOURCE_STATUS_WAITING : 1,
-SOURCE_STATUS_READY : 2,
+_SOURCE_STATUS_READY : 2,
-ID_AUTO_INCREMENT : 0,
+_ID_AUTO_INCREMENT : 0,
 getAI : function() {
-return "autoid-" + (++this.ID_AUTO_INCREMENT);
+return "autoid-" + (++this._ID_AUTO_INCREMENT);
 },
 isoToDate : function(_str) {
 // http://delete.me.uk/2005/03/iso8601.html
 var regexp = "([0-9]{4})(-([0-9]{2})(-([0-9]{2})(T([0-9]{2}):([0-9]{2})(:([0-9]{2})(\.([0-9]+))?)?(Z|(([-+])([0-9]{2}):([0-9]{2})))?)?)?)?";
 var d = _str.match(new RegExp(regexp));
 + pad(d.getUTCMinutes())+':'
 + pad(d.getUTCSeconds())+'Z'
 }
 }
-/* */
+/*
+* IriSP.Model.List is a class for a list of elements (e.g. annotations, medias, etc. that each have a distinct ID)
+*/
 IriSP.Model.List = function(_directory) {
 Array.call(this);
 this.directory = _directory;
 this.idIndex = [];
 if (typeof _directory == "undefined") {
 IriSP.Model.List.prototype.hasId = function(_id) {
 return (IriSP._(this.idIndex).indexOf(_id) !== -1);
 }
+/* On recent browsers, forEach and map are defined and do what we want.
+* Otherwise, we'll use the Underscore.js functions
+*/
 if (typeof Array.prototype.forEach === "undefined") {
 IriSP.Model.List.prototype.forEach = function(_callback) {
 var _this = this;
 IriSP._(this).forEach(function(_value, _key) {
 _callback(_value, _key, _this);
 return _callback(_value, _key, _this);
 });
 }
 }
-/* We override Array's filter function because it doesn't return an IriSP.Model.List */
+/* We override Array's filter function because it doesn't return an IriSP.Model.List
+*/
 IriSP.Model.List.prototype.filter = function(_callback) {
 var _this = this,
 _res = new IriSP.Model.List(this.directory);
 _res.addElements(IriSP._(this).filter(function(_value, _key) {
 return _callback(_value, _key, _this);
 }));
 return _res;
 }
+/* Array has a sort function, but it's not as interesting as Underscore.js's sortBy
+* and won't return a new IriSP.Model.List
+*/
 IriSP.Model.List.prototype.sortBy = function(_callback) {
 var _this = this,
 _res = new IriSP.Model.List(this.directory);
 _res.contents = IriSP._(this).sortBy(function(_value, _key) {
 return _callback(_value, _key, _this);
 });
 return _res;
 }
+/* Title and Description are basic information for (almost) all element types,
+* here we can search by these criteria
+*/
 IriSP.Model.List.prototype.searchByTitle = function(_text) {
 var _rgxp = new RegExp('(' + _text.replace(/(\W)/gm,'\\$1') + ')','gim');
 return this.filter(function(_element) {
 return _rgxp.test(_element.title);
 });
 IriSP.Model.List.prototype.push = function(_el) {
 if (typeof this.directory.getElement(_el.id) === "undefined") {
 this.directory.addElement(_el);
 }
-this.idIndex.push(_el.id);
+var _index = (IriSP._(this.idIndex).indexOf(_el.id));
-Array.prototype.push.call(this, _el);
+if (_index === -1) {
+this.idIndex.push(_el.id);
+Array.prototype.push.call(this, _el);
+} else {
+this[_index] = _el;
+}
 }
 IriSP.Model.List.prototype.addIds = function(_array) {
 var _l = _array.length,
 _this = this;
 IriSP._(_array).forEach(function(_el) {
 _this.push(_el);
 });
 }
-/* */
+/* A simple time management object, that helps converting millisecs to seconds and strings,
+* without the clumsiness of the original Date object.
+*/
 IriSP.Model.Time = function(_milliseconds) {
 this.milliseconds = parseInt(typeof _milliseconds !== "undefined" ? _milliseconds : 0);
 }
 }
 _res += pad(_hms.minutes) + ':' + pad(_hms.seconds);
 return _res;
 }
-/* */
+/* IriSP.Model.Reference handles references between elements
+*/
 IriSP.Model.Reference = function(_source, _idRef) {
 this.source = _source;
 if (typeof _idRef === "object") {
 this.isList = true;
 this.contents.addIds(IriSP._(_idRef).map(function(_id) {
 return _source.getNamespaced(_id).fullname;
 }));
 } else {
 this.isList = false;
-this.contents = _source.getNamespaced(_idRef).fullname;
+this.contents = this.source.directory.getElement(_source.getNamespaced(_idRef).fullname);
 }
-}
-IriSP.Model.Reference.prototype.getContents = function() {
-return (this.isList ? this.contents : this.source.directory.getElement(this.contents));
 }
 /* */
 IriSP.Model.Element = function(_id, _source) {
 this[_elementType] = new IriSP.Model.Reference(this.source, _idRef);
 }
 IriSP.Model.Element.prototype.getReference = function(_elementType) {
 if (typeof this[_elementType] !== "undefined") {
-return this[_elementType].getContents();
+return this[_elementType].contents;
 }
 }
 IriSP.Model.Element.prototype.getRelated = function(_elementType) {
 var _this = this;
 var _ref = _el[_this.elementType];
 if (_ref.isList) {
 return _ref.contents.hasId(_this.id);
 }
 else {
-return _ref.contents === _this.id;
+return _ref.contents.id === _this.id;
 }
 });
 }
 /* */
 }
 /* */
 IriSP.Model.Source = function(_config) {
-this.status = IriSP.Model.SOURCE_STATUS_EMPTY;
+this.status = IriSP.Model._SOURCE_STATUS_EMPTY;
 if (typeof _config !== "undefined") {
 var _this = this;
 IriSP._(_config).forEach(function(_v, _k) {
 _this[_k] = _v;
 })
 });
 return _nsls;
 }
 IriSP.Model.Source.prototype.get = function() {
-this.status = IriSP.Model.SOURCE_STATUS_READY;
+this.status = IriSP.Model._SOURCE_STATUS_READY;
 var _this = this;
 if (_this.callbackQueue.length) {
 IriSP._(_this.callbackQueue).forEach(function(_callback) {
 _callback.call(_this);
 });
 IriSP.Model.Source.prototype.serialize = function() {
 return this.serializer.serialize(this);
 }
 IriSP.Model.Source.prototype.onLoad = function(_callback) {
-if (this.status === IriSP.Model.SOURCE_STATUS_READY) {
+if (this.status === IriSP.Model._SOURCE_STATUS_READY) {
-callback.call(this);
+console.log("Called on load, Ready");
+var _this = this;
+IriSP._.defer(function() {
+_callback.call(_this);
+});
 } else {
+console.log("Called on load, not ready");
 this.callbackQueue.push(_callback);
 }
 }
 IriSP.Model.Source.prototype.getAnnotations = function() {
 }
 IriSP.Model.RemoteSource.prototype = new IriSP.Model.Source();
 IriSP.Model.RemoteSource.prototype.get = function() {
-this.status = IriSP.Model.SOURCE_STATUS_WAITING;
+this.status = IriSP.Model._SOURCE_STATUS_WAITING;
 var _this = this;
 IriSP.jQuery.getJSON(this.url, function(_result) {
 _this.serializer.deSerialize(_result, _this);
+console.log('Received data, we have '+_this.callbackQueue.length+' callbacks waiting');
 if (_this.callbackQueue.length) {
 IriSP._(_this.callbackQueue).forEach(function(_callback) {
 _callback.call(_this);
 });
 }
 _this.callbackQueue = [];
-_this.status = IriSP.Model.SOURCE_STATUS_READY;
+_this.status = IriSP.Model._SOURCE_STATUS_READY;
 });
 }
 /* */

metadataplayer