').html(_data["text/x-iri-selected-html"]);
+ newNode.title = snippet.find("h3:first").text().trim();
+ newNode.uri = snippet.find("h3 a").attr("href");
+ newNode.description = snippet.find(".st:first").text().trim();
+ break;
+ case undefined:
+ default:
+ if (_data["text/x-iri-source-uri"]) {
+ newNode.uri = _data["text/x-iri-source-uri"];
+ }
+ if (_data["text/plain"] || _data["text/x-iri-selected-text"]) {
+ newNode.description = (_data["text/plain"] || _data["text/x-iri-selected-text"]).replace(/[\s\n]+/gm,' ').trim();
+ }
+ if (_data["text/html"] || _data["text/x-iri-selected-html"]) {
+ var snippet = Rkns.$('
').html(_data["text/html"] || _data["text/x-iri-selected-html"]);
+ var _imgs = snippet.find("img");
+ if (_imgs.length) {
+ newNode.image = _imgs[0].src;
+ }
+ var _as = snippet.find("a");
+ if (_as.length) {
+ newNode.uri = _as[0].href;
+ }
+ newNode.title = snippet.find("[title]").attr("title") || newNode.title;
+ newNode.description = snippet.text().replace(/[\s\n]+/gm,' ').trim();
+ }
+ if (_data["text/uri-list"]) {
+ newNode.uri = _data["text/uri-list"];
+ }
+ if (_data["text/x-moz-url"] && !newNode.title) {
+ newNode.title = (_data["text/x-moz-url"].split("\n")[1] || "").trim();
+ if (newNode.title === newNode.uri) {
+ newNode.title = false;
+ }
+ }
+ if (_data["text/x-iri-source-title"] && !newNode.title) {
+ newNode.title = _data["text/x-iri-source-title"];
+ }
+ if (_data["text/html"] || _data["text/x-iri-selected-html"]) {
+ newNode.image = snippet.find("[data-image]").attr("data-image") || newNode.image;
+ newNode.uri = snippet.find("[data-uri]").attr("data-uri") || newNode.uri;
+ newNode.title = snippet.find("[data-title]").attr("data-title") || newNode.title;
+ newNode.description = snippet.find("[data-description]").attr("data-description") || newNode.description;
+ }
+ }
+ if (!newNode.title) {
+ newNode.title = this.renkan.translate("Dragged resource");
+ }
+ var fields = ["title", "description", "uri", "image"];
+ for (var i = 0; i < fields.length; i++) {
+ var f = fields[i];
+ if (_data["text/x-iri-" + f] || _data[f]) {
+ newNode[f] = _data["text/x-iri-" + f] || _data[f];
+ }
+ if (newNode[f] === "none" || newNode[f] === "null") {
+ newNode[f] = undefined;
+ }
+ }
+ var _off = this.canvas_$.offset(),
+ _point = new paper.Point([
+ _event.pageX - _off.left,
+ _event.pageY - _off.top
+ ]),
+ _coords = this.toModelCoords(_point),
+ _nodedata = {
+ id: Rkns.Utils.getUID('node'),
+ created_by: this.renkan.current_user,
+ uri: newNode.uri || "",
+ title: newNode.title || "",
+ description: newNode.description || "",
+ image: newNode.image || "",
+ color: newNode.color || undefined,
+ position: {
+ x: _coords.x,
+ y: _coords.y
+ }
+ };
+ var _node = this.renkan.project.addNode(_nodedata),
+ _repr = this.getRepresentationByModel(_node);
+ if (_event.type === "drop") {
+ _repr.openEditor();
+ }
+};
+
+ /* *********************************************************
+ end of paper-renderer.js
+ ************************************************************
+ ************************************************************
+ start of full-json.js
+ ********************************************************* */
+
+/* Saves the Full JSON at each modification */
+
+Rkns.jsonIO = function(_renkan, _opts) {
+ var _proj = _renkan.project;
+ if (typeof _opts.http_method == "undefined") {
+ _opts.http_method = 'PUT';
+ }
+ var _load = function() {
+ Rkns.$.getJSON(_opts.url, function(_data) {
+ _proj.set(_data, {validate: true});
+ _renkan.renderer.autoScale();
+ });
+ };
+ var _save = function() {
+ var _data = _proj.toJSON();
+ if (!_renkan.read_only) {
+ Rkns.$.ajax({
+ type: _opts.http_method,
+ url: _opts.url,
+ contentType: "application/json",
+ data: JSON.stringify(_data),
+ success: function(data, textStatus, jqXHR) {
+ }
+ });
+ }
+
+ };
+ var _thrSave = Rkns._.throttle(
+ function() {
+ setTimeout(_save, 100);
+ }, 1000);
+ _proj.on("add:nodes add:edges add:users", function(_model) {
+ _model.on("change remove", function(_model) {
+ _thrSave();
+ });
+ _thrSave();
+ });
+ _proj.on("change", function() {
+ _thrSave();
+ });
+
+ _load();
+};
+
+ /* *********************************************************
+ end of full-json.js
+ ************************************************************
+ */
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/model.js
--- a/src/js/model.js Tue Apr 23 15:23:20 2013 +0200
+++ b/src/js/model.js Wed May 15 15:35:15 2013 +0200
@@ -1,6 +1,8 @@
-/* TODO: Separate Project-specific data from Source */
+
+/* js is where data is stored in a standard form, whatever the serializer */
-/* model.js is where data is stored in a standard form, whatever the serializer */
+//TODO: Separate Project-specific data from Source
+
IriSP.Model = (function (ns) {
function pad(n, x, b) {
@@ -31,23 +33,32 @@
String.fromCharCode(768), String.fromCharCode(769), String.fromCharCode(770), String.fromCharCode(771), String.fromCharCode(807),
"｛", "｝", "（", "）", "［", "］", "【", "】", "、", "・", "‥", "。", "「", "」", "『", "』", "〜", "：", "！", "？", " ",
",", " ", ";", "(", ")", ".", "*", "+", "\\", "?", "|", "{", "}", "[", "]", "^", "#", "/"
- ]
+ ];
-var Model = {
- _SOURCE_STATUS_EMPTY : 0,
- _SOURCE_STATUS_WAITING : 1,
- _SOURCE_STATUS_READY : 2,
- getUID : function() {
+var Model = {},
+ _SOURCE_STATUS_EMPTY = Model._SOURCE_STATUS_EMPTY = 0,
+ _SOURCE_STATUS_WAITING = Model._SOURCE_STATUS_WAITING = 1,
+ _SOURCE_STATUS_READY = Model._SOURCE_STATUS_READY = 2,
+ extendPrototype = Model.extendPrototype = function(toClass, fromClass) {
+ var fromP = fromClass.prototype,
+ toP = toClass.prototype;
+ for (var k in fromP) {
+ if (fromP.hasOwnProperty(k)) {
+ toP[k] = fromP[k];
+ }
+ }
+ },
+ getUID = Model.getUID = function() {
return uidbase + pad(4, (++uidincrement % 0x10000), 16) + "-" + rand16(4) + "-" + rand16(6) + rand16(6);
},
- isLocalURL : function(url) {
+ isLocalURL = Model.isLocalURL = function(url) {
var matches = url.match(/^(\w+:)\/\/([^/]+)/);
if (matches) {
return(matches[1] === document.location.protocol && matches[2] === document.location.host)
}
return true;
},
- regexpFromTextOrArray : function(_textOrArray, _testOnly, _iexact) {
+ regexpFromTextOrArray = Model.regexpFromTextOrArray = function(_textOrArray, _testOnly, _iexact) {
var _testOnly = _testOnly || false,
_iexact = _iexact || false;
function escapeText(_text) {
@@ -67,7 +78,7 @@
}
return new RegExp( _source, _flags);
},
- fullTextRegexps: function(_text) {
+ fullTextRegexps = Model.fullTextRegexps = function(_text) {
var remsrc = "[\\" + removeChars.join("\\") + "]",
remrx = new RegExp(remsrc,"gm"),
txt = _text.toLowerCase().replace(remrx,"")
@@ -88,7 +99,7 @@
}
return "(" + src + ")";
},
- isoToDate : function(_str) {
+ isoToDate = Model.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));
@@ -113,7 +124,7 @@
_res.setTime(Number(time));
return _res;
},
- dateToIso : function(_d) {
+ dateToIso = Model.dateToIso = function(_d) {
var d = _d ? new Date(_d) : new Date();
return d.getUTCFullYear()+'-'
+ pad(2, d.getUTCMonth()+1)+'-'
@@ -121,20 +132,19 @@
+ pad(2, d.getUTCHours())+':'
+ pad(2, d.getUTCMinutes())+':'
+ pad(2, d.getUTCSeconds())+'Z'
- }
-}
+ };
/*
- * Model.List is a class for a list of elements (e.g. annotations, medias, etc. that each have a distinct ID)
+ * List is a class for a list of elements (e.g. annotations, medias, etc. that each have a distinct ID)
*/
-Model.List = function(_directory) {
+var List = Model.List = function(_directory) {
Array.call(this);
this.directory = _directory;
this.idIndex = [];
this.__events = {};
if (typeof _directory == "undefined") {
console.trace();
- throw "Error : new Model.List(directory): directory is undefined";
+ throw "Error : new List(directory): directory is undefined";
}
var _this = this;
this.on("clear-search", function() {
@@ -145,113 +155,113 @@
});
_this.trigger("search-cleared");
})
-}
+};
-Model.List.prototype = new Array();
+List.prototype = new Array();
-Model.List.prototype.hasId = function(_id) {
+List.prototype.hasId = function(_id) {
return ns._(this.idIndex).include(_id);
-}
+};
/* 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") {
- Model.List.prototype.forEach = function(_callback) {
+ List.prototype.forEach = function(_callback) {
var _this = this;
ns._(this).forEach(function(_value, _key) {
_callback(_value, _key, _this);
});
}
-}
+};
if (typeof Array.prototype.map === "undefined") {
- Model.List.prototype.map = function(_callback) {
+ List.prototype.map = function(_callback) {
var _this = this;
return ns._(this).map(function(_value, _key) {
return _callback(_value, _key, _this);
});
}
-}
+};
-Model.List.prototype.pluck = function(_key) {
+List.prototype.pluck = function(_key) {
return this.map(function(_value) {
return _value[_key];
});
-}
+};
-/* We override Array's filter function because it doesn't return an Model.List
+/* We override Array's filter function because it doesn't return an List
*/
-Model.List.prototype.filter = function(_callback) {
+List.prototype.filter = function(_callback) {
var _this = this,
- _res = new Model.List(this.directory);
+ _res = new List(this.directory);
_res.addElements(ns._(this).filter(function(_value, _key) {
return _callback(_value, _key, _this);
}));
return _res;
-}
+};
-Model.List.prototype.slice = function(_start, _end) {
- var _res = new Model.List(this.directory);
+List.prototype.slice = function(_start, _end) {
+ var _res = new List(this.directory);
_res.addElements(Array.prototype.slice.call(this, _start, _end));
return _res;
-}
+};
-Model.List.prototype.splice = function(_start, _end) {
- var _res = new Model.List(this.directory);
+List.prototype.splice = function(_start, _end) {
+ var _res = new List(this.directory);
_res.addElements(Array.prototype.splice.call(this, _start, _end));
this.idIndex.splice(_start, _end);
return _res;
-}
+};
/* Array has a sort function, but it's not as interesting as Underscore.js's sortBy
- * and won't return a new Model.List
+ * and won't return a new List
*/
-Model.List.prototype.sortBy = function(_callback) {
+List.prototype.sortBy = function(_callback) {
var _this = this,
- _res = new Model.List(this.directory);
+ _res = new List(this.directory);
_res.addElements(ns._(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
*/
-Model.List.prototype.searchByTitle = function(_text, _iexact) {
+List.prototype.searchByTitle = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
+ _rgxp = regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
return _rgxp.test(_element.title);
});
-}
+};
-Model.List.prototype.searchByDescription = function(_text, _iexact) {
+List.prototype.searchByDescription = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
+ _rgxp = regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
return _rgxp.test(_element.description);
});
-}
+};
-Model.List.prototype.searchByTextFields = function(_text, _iexact) {
+List.prototype.searchByTextFields = function(_text, _iexact) {
var _iexact = _iexact || false,
- _rgxp = Model.regexpFromTextOrArray(_text, true, _iexact);
+ _rgxp = regexpFromTextOrArray(_text, true, _iexact);
return this.filter(function(_element) {
var keywords = (_element.keywords || _element.getTagTexts() || []).join(", ");
return _rgxp.test(_element.description) || _rgxp.test(_element.title) || _rgxp.test(keywords);
});
-}
+};
-Model.List.prototype.search = function(_text) {
+List.prototype.search = function(_text) {
if (!_text) {
this.trigger("clear-search");
return this;
}
this.searching = true;
this.trigger("search", _text);
- var rxsource = Model.fullTextRegexps(_text)
+ var rxsource = fullTextRegexps(_text)
rgxp = new RegExp(rxsource,"im"),
this.regexp = new RegExp(rxsource,"gim");
var res = this.filter(function(_element, _k) {
@@ -264,23 +274,23 @@
});
this.trigger(res.length ? "found" : "not-found",res);
return res;
-}
+};
-Model.List.prototype.getTitles = function() {
+List.prototype.getTitles = function() {
return this.map(function(_el) {
return _el.title;
});
-}
+};
-Model.List.prototype.addId = function(_id) {
+List.prototype.addId = function(_id) {
var _el = this.directory.getElement(_id)
if (!this.hasId(_id) && typeof _el !== "undefined") {
this.idIndex.push(_id);
Array.prototype.push.call(this, _el);
}
-}
+};
-Model.List.prototype.push = function(_el) {
+List.prototype.push = function(_el) {
if (typeof _el === "undefined") {
return;
}
@@ -291,24 +301,24 @@
} else {
this[_index] = _el;
}
-}
+};
-Model.List.prototype.addIds = function(_array) {
+List.prototype.addIds = function(_array) {
var _l = _array.length,
_this = this;
ns._(_array).forEach(function(_id) {
_this.addId(_id);
});
-}
+};
-Model.List.prototype.addElements = function(_array) {
+List.prototype.addElements = function(_array) {
var _this = this;
ns._(_array).forEach(function(_el) {
_this.push(_el);
});
-}
+};
-Model.List.prototype.removeId = function(_id, _deleteFromDirectory) {
+List.prototype.removeId = function(_id, _deleteFromDirectory) {
var _deleteFromDirectory = _deleteFromDirectory || false,
_index = (ns._(this.idIndex).indexOf(_id));
if (_index !== -1) {
@@ -317,61 +327,61 @@
if (_deleteFromDirectory) {
delete this.directory.elements[_id];
}
-}
+};
-Model.List.prototype.removeElement = function(_el, _deleteFromDirectory) {
+List.prototype.removeElement = function(_el, _deleteFromDirectory) {
var _deleteFromDirectory = _deleteFromDirectory || false;
this.removeId(_el.id);
-}
+};
-Model.List.prototype.removeIds = function(_list, _deleteFromDirectory) {
+List.prototype.removeIds = function(_list, _deleteFromDirectory) {
var _deleteFromDirectory = _deleteFromDirectory || false,
_this = this;
ns._(_list).forEach(function(_id) {
_this.removeId(_id);
});
-}
+};
-Model.List.prototype.removeElements = function(_list, _deleteFromDirectory) {
+List.prototype.removeElements = function(_list, _deleteFromDirectory) {
var _deleteFromDirectory = _deleteFromDirectory || false,
_this = this;
ns._(_list).forEach(function(_el) {
_this.removeElement(_el);
});
-}
+};
-Model.List.prototype.on = function(_event, _callback) {
+List.prototype.on = function(_event, _callback) {
if (typeof this.__events[_event] === "undefined") {
this.__events[_event] = [];
}
this.__events[_event].push(_callback);
-}
+};
-Model.List.prototype.off = function(_event, _callback) {
+List.prototype.off = function(_event, _callback) {
if (typeof this.__events[_event] !== "undefined") {
this.__events[_event] = ns._(this.__events[_event]).reject(function(_fn) {
return _fn === _callback;
});
}
-}
+};
-Model.List.prototype.trigger = function(_event, _data) {
+List.prototype.trigger = function(_event, _data) {
var _list = this;
ns._(this.__events[_event]).each(function(_callback) {
_callback.call(_list, _data);
});
-}
+};
/* A simple time management object, that helps converting millisecs to seconds and strings,
* without the clumsiness of the original Date object.
*/
-Model.Time = function(_milliseconds) {
+var Time = Model.Time = function(_milliseconds) {
this.milliseconds = 0;
this.setMilliseconds(_milliseconds);
-}
+};
-Model.Time.prototype.setMilliseconds = function(_milliseconds) {
+Time.prototype.setMilliseconds = function(_milliseconds) {
var _ante = this.milliseconds;
switch(typeof _milliseconds) {
case "string":
@@ -389,17 +399,17 @@
if (this.milliseconds === NaN) {
this.milliseconds = _ante;
}
-}
+};
-Model.Time.prototype.setSeconds = function(_seconds) {
+Time.prototype.setSeconds = function(_seconds) {
this.milliseconds = 1000 * _seconds;
-}
+};
-Model.Time.prototype.getSeconds = function() {
+Time.prototype.getSeconds = function() {
return this.milliseconds / 1000;
-}
+};
-Model.Time.prototype.getHMS = function() {
+Time.prototype.getHMS = function() {
var _totalSeconds = Math.abs(Math.floor(this.getSeconds()));
return {
hours : Math.floor(_totalSeconds / 3600),
@@ -407,17 +417,17 @@
seconds : _totalSeconds % 60,
milliseconds: this.milliseconds % 1000
}
-}
+};
-Model.Time.prototype.add = function(_milliseconds) {
- this.milliseconds += new Model.Time(_milliseconds).milliseconds;
-}
+Time.prototype.add = function(_milliseconds) {
+ this.milliseconds += new Time(_milliseconds).milliseconds;
+};
-Model.Time.prototype.valueOf = function() {
+Time.prototype.valueOf = function() {
return this.milliseconds;
-}
+};
-Model.Time.prototype.toString = function(showCs) {
+Time.prototype.toString = function(showCs) {
var _hms = this.getHMS(),
_res = '';
if (_hms.hours) {
@@ -428,12 +438,12 @@
_res += "." + Math.floor(_hms.milliseconds / 100)
}
return _res;
-}
+};
-/* Model.Reference handles references between elements
+/* Reference handles references between elements
*/
-Model.Reference = function(_source, _idRef) {
+var Reference = Model.Reference = function(_source, _idRef) {
this.source = _source;
this.id = _idRef;
if (typeof _idRef === "object") {
@@ -442,36 +452,36 @@
this.isList = false;
}
this.refresh();
-}
+};
-Model.Reference.prototype.refresh = function() {
+Reference.prototype.refresh = function() {
if (this.isList) {
- this.contents = new Model.List(this.source.directory);
+ this.contents = new List(this.source.directory);
this.contents.addIds(this.id);
} else {
this.contents = this.source.getElement(this.id);
}
-}
+};
-Model.Reference.prototype.getContents = function() {
+Reference.prototype.getContents = function() {
if (typeof this.contents === "undefined" || (this.isList && this.contents.length != this.id.length)) {
this.refresh();
}
return this.contents;
-}
+};
-Model.Reference.prototype.isOrHasId = function(_idRef) {
+Reference.prototype.isOrHasId = function(_idRef) {
if (this.isList) {
return (ns._(this.id).indexOf(_idRef) !== -1)
} else {
return (this.id == _idRef);
}
-}
+};
/* */
-Model.Element = function(_id, _source) {
+var BaseElement = Model.Element = function(_id, _source) {
this.elementType = 'element';
this.title = "";
this.description = "";
@@ -480,69 +490,69 @@
return;
}
if (typeof _id === "undefined" || !_id) {
- _id = Model.getUID();
+ _id = getUID();
}
this.id = _id;
this.source = _source;
if (_source !== this) {
this.source.directory.addElement(this);
}
-}
+};
-Model.Element.prototype.toString = function() {
+BaseElement.prototype.toString = function() {
return this.elementType + (this.elementType !== 'element' ? ', id=' + this.id + ', title="' + this.title + '"' : '');
-}
+};
-Model.Element.prototype.setReference = function(_elementType, _idRef) {
- this[_elementType] = new Model.Reference(this.source, _idRef);
-}
+BaseElement.prototype.setReference = function(_elementType, _idRef) {
+ this[_elementType] = new Reference(this.source, _idRef);
+};
-Model.Element.prototype.getReference = function(_elementType) {
+BaseElement.prototype.getReference = function(_elementType) {
if (typeof this[_elementType] !== "undefined") {
return this[_elementType].getContents();
}
-}
+};
-Model.Element.prototype.getRelated = function(_elementType, _global) {
+BaseElement.prototype.getRelated = function(_elementType, _global) {
_global = (typeof _global !== "undefined" && _global);
var _this = this;
return this.source.getList(_elementType, _global).filter(function(_el) {
var _ref = _el[_this.elementType];
return _ref && _ref.isOrHasId(_this.id);
});
-}
+};
-Model.Element.prototype.on = function(_event, _callback) {
+BaseElement.prototype.on = function(_event, _callback) {
if (typeof this.__events[_event] === "undefined") {
this.__events[_event] = [];
}
this.__events[_event].push(_callback);
-}
+};
-Model.Element.prototype.off = function(_event, _callback) {
+BaseElement.prototype.off = function(_event, _callback) {
if (typeof this.__events[_event] !== "undefined") {
this.__events[_event] = ns._(this.__events[_event]).reject(function(_fn) {
return _fn === _callback;
});
}
-}
+};
-Model.Element.prototype.trigger = function(_event, _data) {
+BaseElement.prototype.trigger = function(_event, _data) {
var _element = this;
ns._(this.__events[_event]).each(function(_callback) {
_callback.call(_element, _data);
});
-}
+};
/* */
-Model.Playable = function(_id, _source) {
- Model.Element.call(this, _id, _source);
+var Playable = Model.Playable = function(_id, _source) {
+ BaseElement.call(this, _id, _source);
if (typeof _source === "undefined") {
return;
}
this.elementType = 'playable';
- this.currentTime = new Model.Time();
+ this.currentTime = new Time();
this.volume = .5;
this.paused = true;
this.muted = false;
@@ -573,188 +583,188 @@
});
this.on("loadedmetadata", function() {
_this.loadedMetadata = true;
- })
-}
+ });
+};
-Model.Playable.prototype = new Model.Element();
+extendPrototype(Playable, BaseElement);
-Model.Playable.prototype.getCurrentTime = function() {
+Playable.prototype.getCurrentTime = function() {
return this.currentTime;
-}
+};
-Model.Playable.prototype.getVolume = function() {
+Playable.prototype.getVolume = function() {
return this.volume;
-}
+};
-Model.Playable.prototype.getPaused = function() {
+Playable.prototype.getPaused = function() {
return this.paused;
-}
+};
-Model.Playable.prototype.getMuted = function() {
+Playable.prototype.getMuted = function() {
return this.muted;
-}
+};
-Model.Playable.prototype.setCurrentTime = function(_time) {
+Playable.prototype.setCurrentTime = function(_time) {
this.trigger("setcurrenttime",_time);
-}
+};
-Model.Playable.prototype.setVolume = function(_vol) {
+Playable.prototype.setVolume = function(_vol) {
this.trigger("setvolume",_vol);
-}
+};
-Model.Playable.prototype.setMuted = function(_muted) {
+Playable.prototype.setMuted = function(_muted) {
this.trigger("setmuted",_muted);
-}
+};
-Model.Playable.prototype.play = function() {
+Playable.prototype.play = function() {
this.trigger("setplay");
-}
+};
-Model.Playable.prototype.pause = function() {
+Playable.prototype.pause = function() {
this.trigger("setpause");
-}
+};
-Model.Playable.prototype.show = function() {}
+Playable.prototype.show = function() {};
-Model.Playable.prototype.hide = function() {}
+Playable.prototype.hide = function() {};
/* */
-Model.Media = function(_id, _source) {
- Model.Playable.call(this, _id, _source);
+var Media = Model.Media = function(_id, _source) {
+ Playable.call(this, _id, _source);
this.elementType = 'media';
- this.duration = new Model.Time();
+ this.duration = new Time();
this.video = '';
var _this = this;
-}
+};
-Model.Media.prototype = new Model.Playable();
+extendPrototype(Media, Playable);
/* Default functions to be overriden by players */
-Model.Media.prototype.setDuration = function(_durationMs) {
+Media.prototype.setDuration = function(_durationMs) {
this.duration.setMilliseconds(_durationMs);
-}
+};
-Model.Media.prototype.getAnnotations = function() {
+Media.prototype.getAnnotations = function() {
return this.getRelated("annotation");
-}
+};
-Model.Media.prototype.getAnnotationsByTypeTitle = function(_title) {
+Media.prototype.getAnnotationsByTypeTitle = function(_title) {
var _annTypes = this.source.getAnnotationTypes().searchByTitle(_title).pluck("id");
if (_annTypes.length) {
return this.getAnnotations().filter(function(_annotation) {
return ns._(_annTypes).indexOf(_annotation.getAnnotationType().id) !== -1;
});
} else {
- return new Model.List(this.source.directory)
+ return new List(this.source.directory)
}
-}
+};
/* */
-Model.Tag = function(_id, _source) {
- Model.Element.call(this, _id, _source);
+var Tag = Model.Tag = function(_id, _source) {
+ BaseElement.call(this, _id, _source);
this.elementType = 'tag';
-}
+};
-Model.Tag.prototype = new Model.Element();
+extendPrototype(Tag, BaseElement);
-Model.Tag.prototype.getAnnotations = function() {
+Tag.prototype.getAnnotations = function() {
return this.getRelated("annotation");
-}
+};
/* */
-Model.AnnotationType = function(_id, _source) {
- Model.Element.call(this, _id, _source);
+var AnnotationType = Model.AnnotationType = function(_id, _source) {
+ BaseElement.call(this, _id, _source);
this.elementType = 'annotationType';
-}
+};
-Model.AnnotationType.prototype = new Model.Element();
+extendPrototype(AnnotationType, BaseElement);
-Model.AnnotationType.prototype.getAnnotations = function() {
+AnnotationType.prototype.getAnnotations = function() {
return this.getRelated("annotation");
-}
+};
/* Annotation
* */
-Model.Annotation = function(_id, _source) {
- Model.Element.call(this, _id, _source);
+var Annotation = Model.Annotation = function(_id, _source) {
+ BaseElement.call(this, _id, _source);
this.elementType = 'annotation';
- this.begin = new Model.Time();
- this.end = new Model.Time();
- this.tag = new Model.Reference(_source, []);
+ this.begin = new Time();
+ this.end = new Time();
+ this.tag = new Reference(_source, []);
this.playing = false;
var _this = this;
this.on("click", function() {
_this.getMedia().setCurrentTime(_this.begin);
});
-}
+};
-Model.Annotation.prototype = new Model.Element();
+extendPrototype(Annotation, BaseElement);
-Model.Annotation.prototype.setBegin = function(_beginMs) {
+Annotation.prototype.setBegin = function(_beginMs) {
this.begin.setMilliseconds(Math.max(0,_beginMs));
this.trigger("change-begin");
if (this.end < this.begin) {
this.setEnd(this.begin);
}
-}
+};
-Model.Annotation.prototype.setEnd = function(_endMs) {
+Annotation.prototype.setEnd = function(_endMs) {
this.end.setMilliseconds(Math.min(_endMs, this.getMedia().duration.milliseconds));
this.trigger("change-end");
if (this.end < this.begin) {
this.setBegin(this.end);
}
-}
+};
-Model.Annotation.prototype.setDuration = function(_durMs) {
+Annotation.prototype.setDuration = function(_durMs) {
this.setEnd(_durMs + this.begin.milliseconds);
-}
+};
-Model.Annotation.prototype.setMedia = function(_idRef) {
+Annotation.prototype.setMedia = function(_idRef) {
this.setReference("media", _idRef);
-}
+};
-Model.Annotation.prototype.getMedia = function() {
+Annotation.prototype.getMedia = function() {
return this.getReference("media");
-}
+};
-Model.Annotation.prototype.setAnnotationType = function(_idRef) {
+Annotation.prototype.setAnnotationType = function(_idRef) {
this.setReference("annotationType", _idRef);
-}
+};
-Model.Annotation.prototype.getAnnotationType = function() {
+Annotation.prototype.getAnnotationType = function() {
return this.getReference("annotationType");
-}
+};
-Model.Annotation.prototype.setTags = function(_idRefs) {
+Annotation.prototype.setTags = function(_idRefs) {
this.setReference("tag", _idRefs);
-}
+};
-Model.Annotation.prototype.getTags = function() {
+Annotation.prototype.getTags = function() {
return this.getReference("tag");
-}
+};
-Model.Annotation.prototype.getTagTexts = function() {
+Annotation.prototype.getTagTexts = function() {
return this.getTags().getTitles();
-}
+};
-Model.Annotation.prototype.getDuration = function() {
- return new Model.Time(this.end.milliseconds - this.begin.milliseconds)
-}
+Annotation.prototype.getDuration = function() {
+ return new Time(this.end.milliseconds - this.begin.milliseconds)
+};
/* */
-Model.MashedAnnotation = function(_mashup, _annotation) {
- Model.Element.call(this, _mashup.id + "_" + _annotation.id, _annotation.source);
+var MashedAnnotation = Model.MashedAnnotation = function(_mashup, _annotation) {
+ BaseElement.call(this, _mashup.id + "_" + _annotation.id, _annotation.source);
this.elementType = 'mashedAnnotation';
this.annotation = _annotation;
- this.begin = new Model.Time();
- this.end = new Model.Time();
- this.duration = new Model.Time();
+ this.begin = new Time();
+ this.end = new Time();
+ this.duration = new Time();
this.title = this.annotation.title;
this.description = this.annotation.description;
this.color = this.annotation.color;
@@ -768,43 +778,43 @@
this.on("leave", function() {
_this.annotation.trigger("leave");
});
-}
+};
-Model.MashedAnnotation.prototype = new Model.Element(null);
+extendPrototype(MashedAnnotation, BaseElement);
-Model.MashedAnnotation.prototype.getMedia = function() {
+MashedAnnotation.prototype.getMedia = function() {
return this.annotation.getReference("media");
-}
+};
-Model.MashedAnnotation.prototype.getAnnotationType = function() {
+MashedAnnotation.prototype.getAnnotationType = function() {
return this.annotation.getReference("annotationType");
-}
+};
-Model.MashedAnnotation.prototype.getTags = function() {
+MashedAnnotation.prototype.getTags = function() {
return this.annotation.getReference("tag");
-}
+};
-Model.MashedAnnotation.prototype.getTagTexts = function() {
+MashedAnnotation.prototype.getTagTexts = function() {
return this.annotation.getTags().getTitles();
-}
+};
-Model.MashedAnnotation.prototype.getDuration = function() {
+MashedAnnotation.prototype.getDuration = function() {
return this.annotation.getDuration();
-}
+};
-Model.MashedAnnotation.prototype.setBegin = function(_begin) {
+MashedAnnotation.prototype.setBegin = function(_begin) {
this.begin.setMilliseconds(_begin);
this.duration.setMilliseconds(this.annotation.getDuration());
this.end.setMilliseconds(_begin + this.duration);
-}
+};
/* */
-Model.Mashup = function(_id, _source) {
- Model.Playable.call(this, _id, _source);
+var Mashup = Model.Mashup = function(_id, _source) {
+ Playable.call(this, _id, _source);
this.elementType = 'mashup';
- this.duration = new Model.Time();
- this.segments = new Model.List(_source.directory);
+ this.duration = new Time();
+ this.segments = new List(_source.directory);
this.loaded = false;
var _this = this;
this._updateTimes = function() {
@@ -813,21 +823,21 @@
}
this.on("add", this._updateTimes);
this.on("remove", this._updateTimes);
-}
+};
-Model.Mashup.prototype = new Model.Playable();
+extendPrototype(Mashup, Playable);
-Model.Mashup.prototype.updateTimes = function() {
+Mashup.prototype.updateTimes = function() {
var _time = 0;
this.segments.forEach(function(_segment) {
_segment.setBegin(_time);
_time = _segment.end;
});
this.duration.setMilliseconds(_time);
-}
+};
-Model.Mashup.prototype.addAnnotation = function(_annotation, _defer) {
- var _mashedAnnotation = new Model.MashedAnnotation(this, _annotation),
+Mashup.prototype.addAnnotation = function(_annotation, _defer) {
+ var _mashedAnnotation = new MashedAnnotation(this, _annotation),
_defer = _defer || false;
this.segments.push(_mashedAnnotation);
_annotation.on("change-begin", this._updateTimes);
@@ -835,33 +845,33 @@
if (!_defer) {
this.trigger("add");
}
-}
+};
-Model.Mashup.prototype.addAnnotationById = function(_elId, _defer) {
+Mashup.prototype.addAnnotationById = function(_elId, _defer) {
var _annotation = this.source.getElement(_elId),
_defer = _defer || false;
if (typeof _annotation !== "undefined") {
this.addAnnotation(_annotation, _defer);
}
-}
+};
-Model.Mashup.prototype.addAnnotations = function(_segments) {
+Mashup.prototype.addAnnotations = function(_segments) {
var _this = this;
ns._(_segments).forEach(function(_segment) {
_this.addAnnotation(_segment, true);
});
this.trigger("add");
-}
+};
-Model.Mashup.prototype.addAnnotationsById = function(_segments) {
+Mashup.prototype.addAnnotationsById = function(_segments) {
var _this = this;
ns._(_segments).forEach(function(_segment) {
_this.addAnnotationById(_segment, true);
});
this.trigger("add");
-}
+};
-Model.Mashup.prototype.removeAnnotation = function(_annotation, _defer) {
+Mashup.prototype.removeAnnotation = function(_annotation, _defer) {
var _defer = _defer || false;
_annotation.off("change-begin", this._updateTimes);
_annotation.off("change-end", this._updateTimes);
@@ -869,9 +879,9 @@
if (!_defer) {
this.trigger("remove");
}
-}
+};
-Model.Mashup.prototype.removeAnnotationById = function(_annId, _defer) {
+Mashup.prototype.removeAnnotationById = function(_annId, _defer) {
var _defer = _defer || false;
var _annotation = this.source.getElement(_annId);
@@ -881,72 +891,72 @@
if (!_defer) {
this.trigger("remove");
}
-}
+};
-Model.Mashup.prototype.setAnnotations = function(_segments) {
+Mashup.prototype.setAnnotations = function(_segments) {
while (this.segments.length) {
this.removeAnnotation(this.segments[0].annotation, true);
}
this.addAnnotations(_segments);
-}
+};
-Model.Mashup.prototype.setAnnotationsById = function(_segments) {
+Mashup.prototype.setAnnotationsById = function(_segments) {
while (this.segments.length) {
this.removeAnnotation(this.segments[0].annotation, true);
}
this.addAnnotationsById(_segments);
-}
+};
-Model.Mashup.prototype.hasAnnotation = function(_annotation) {
+Mashup.prototype.hasAnnotation = function(_annotation) {
return !!ns._(this.segments).find(function(_s) {
return _s.annotation === _annotation
});
-}
+};
-Model.Mashup.prototype.getAnnotation = function(_annotation) {
+Mashup.prototype.getAnnotation = function(_annotation) {
return ns._(this.segments).find(function(_s) {
return _s.annotation === _annotation
});
-}
+};
-Model.Mashup.prototype.getAnnotationById = function(_id) {
+Mashup.prototype.getAnnotationById = function(_id) {
return ns._(this.segments).find(function(_s) {
return _s.annotation.id === _id
});
-}
+};
-Model.Mashup.prototype.getAnnotations = function() {
+Mashup.prototype.getAnnotations = function() {
return this.segments;
-}
+};
-Model.Mashup.prototype.getOriginalAnnotations = function() {
- var annotations = new Model.List(this.source.directory);
+Mashup.prototype.getOriginalAnnotations = function() {
+ var annotations = new List(this.source.directory);
this.segments.forEach(function(_s) {
annotations.push(_s.annotation);
});
return annotations;
-}
+};
-Model.Mashup.prototype.getMedias = function() {
- var medias = new Model.List(this.source.directory);
+Mashup.prototype.getMedias = function() {
+ var medias = new List(this.source.directory);
this.segments.forEach(function(_annotation) {
medias.push(_annotation.getMedia())
})
return medias;
-}
+};
-Model.Mashup.prototype.getAnnotationsByTypeTitle = function(_title) {
+Mashup.prototype.getAnnotationsByTypeTitle = function(_title) {
var _annTypes = this.source.getAnnotationTypes().searchByTitle(_title).pluck("id");
if (_annTypes.length) {
return this.getAnnotations().filter(function(_annotation) {
return ns._(_annTypes).indexOf(_annotation.getAnnotationType().id) !== -1;
});
} else {
- return new Model.List(this.source.directory)
+ return new List(this.source.directory)
}
-}
+};
-Model.Mashup.prototype.getAnnotationAtTime = function(_time) {
+Mashup.prototype.getAnnotationAtTime = function(_time) {
var _list = this.segments.filter(function(_annotation) {
return _annotation.begin <= _time && _annotation.end > _time;
});
@@ -955,22 +965,22 @@
} else {
return undefined;
}
-}
+};
-Model.Mashup.prototype.getMediaAtTime = function(_time) {
+Mashup.prototype.getMediaAtTime = function(_time) {
var _annotation = this.getAnnotationAtTime(_time);
if (typeof _annotation !== "undefined") {
return _annotation.getMedia();
} else {
return undefined;
}
-}
+};
/* */
-Model.Source = function(_config) {
- Model.Element.call(this, false, this);
- this.status = Model._SOURCE_STATUS_EMPTY;
+var Source = Model.Source = function(_config) {
+ BaseElement.call(this, false, this);
+ this.status = _SOURCE_STATUS_EMPTY;
this.elementType = "source";
if (typeof _config !== "undefined") {
var _this = this;
@@ -981,117 +991,117 @@
this.contents = {};
this.get();
}
-}
+};
-Model.Source.prototype = new Model.Element();
+extendPrototype(Source, BaseElement);
-Model.Source.prototype.addList = function(_listId, _contents) {
+Source.prototype.addList = function(_listId, _contents) {
if (typeof this.contents[_listId] === "undefined") {
- this.contents[_listId] = new Model.List(this.directory);
+ this.contents[_listId] = new List(this.directory);
}
this.contents[_listId].addElements(_contents);
-}
+};
-Model.Source.prototype.getList = function(_listId, _global) {
+Source.prototype.getList = function(_listId, _global) {
_global = (typeof _global !== "undefined" && _global);
if (_global) {
return this.directory.getGlobalList().filter(function(_e) {
return (_e.elementType === _listId);
});
} else {
- return this.contents[_listId] || new IriSP.Model.List(this.directory);
+ return this.contents[_listId] || new IriSP.List(this.directory);
}
-}
+};
-Model.Source.prototype.forEach = function(_callback) {
+Source.prototype.forEach = function(_callback) {
var _this = this;
ns._(this.contents).forEach(function(_value, _key) {
_callback.call(_this, _value, _key);
})
-}
+};
-Model.Source.prototype.getElement = function(_elId) {
+Source.prototype.getElement = function(_elId) {
return this.directory.getElement(_elId);
-}
+};
-Model.Source.prototype.get = function() {
- this.status = Model._SOURCE_STATUS_WAITING;
+Source.prototype.get = function() {
+ this.status = _SOURCE_STATUS_WAITING;
this.handleCallbacks();
-}
+};
/* We defer the callbacks calls so they execute after the queue is cleared */
-Model.Source.prototype.deferCallback = function(_callback) {
+Source.prototype.deferCallback = function(_callback) {
var _this = this;
ns._.defer(function() {
_callback.call(_this);
});
-}
+};
-Model.Source.prototype.handleCallbacks = function() {
- this.status = Model._SOURCE_STATUS_READY;
+Source.prototype.handleCallbacks = function() {
+ this.status = _SOURCE_STATUS_READY;
while (this.callbackQueue.length) {
this.deferCallback(this.callbackQueue.splice(0,1)[0]);
}
-}
-Model.Source.prototype.onLoad = function(_callback) {
- if (this.status === Model._SOURCE_STATUS_READY) {
+};
+Source.prototype.onLoad = function(_callback) {
+ if (this.status === _SOURCE_STATUS_READY) {
this.deferCallback(_callback);
} else {
this.callbackQueue.push(_callback);
}
-}
+};
-Model.Source.prototype.serialize = function() {
+Source.prototype.serialize = function() {
return this.serializer.serialize(this);
-}
+};
-Model.Source.prototype.deSerialize = function(_data) {
+Source.prototype.deSerialize = function(_data) {
this.serializer.deSerialize(_data, this);
-}
+};
-Model.Source.prototype.getAnnotations = function(_global) {
+Source.prototype.getAnnotations = function(_global) {
_global = (typeof _global !== "undefined" && _global);
return this.getList("annotation", _global);
-}
+};
-Model.Source.prototype.getMedias = function(_global) {
+Source.prototype.getMedias = function(_global) {
_global = (typeof _global !== "undefined" && _global);
return this.getList("media", _global);
-}
+};
-Model.Source.prototype.getTags = function(_global) {
+Source.prototype.getTags = function(_global) {
_global = (typeof _global !== "undefined" && _global);
return this.getList("tag", _global);
-}
+};
-Model.Source.prototype.getMashups = function(_global) {
+Source.prototype.getMashups = function(_global) {
_global = (typeof _global !== "undefined" && _global);
return this.getList("mashup", _global);
-}
+};
-Model.Source.prototype.getAnnotationTypes = function(_global) {
+Source.prototype.getAnnotationTypes = function(_global) {
_global = (typeof _global !== "undefined" && _global);
return this.getList("annotationType", _global);
-}
+};
-Model.Source.prototype.getAnnotationsByTypeTitle = function(_title, _global) {
+Source.prototype.getAnnotationsByTypeTitle = function(_title, _global) {
_global = (typeof _global !== "undefined" && _global);
- var _res = new Model.List(this.directory),
+ var _res = new List(this.directory),
_annTypes = this.getAnnotationTypes(_global).searchByTitle(_title);
_annTypes.forEach(function(_annType) {
_res.addElements(_annType.getAnnotations(_global));
})
return _res;
-}
+};
-Model.Source.prototype.getDuration = function() {
+Source.prototype.getDuration = function() {
var _m = this.currentMedia;
if (typeof _m !== "undefined") {
return this.currentMedia.duration;
}
-}
+};
-Model.Source.prototype.getCurrentMedia = function(_opts) {
+Source.prototype.getCurrentMedia = function(_opts) {
if (typeof this.currentMedia === "undefined") {
if (_opts.is_mashup) {
var _mashups = this.getMashups();
@@ -1106,28 +1116,28 @@
}
}
return this.currentMedia;
-}
+};
-Model.Source.prototype.merge = function(_source) {
+Source.prototype.merge = function(_source) {
var _this = this;
_source.forEach(function(_value, _key) {
_this.getList(_key).addElements(_value);
});
-}
+};
/* */
-Model.RemoteSource = function(_config) {
- Model.Source.call(this, _config);
-}
+var RemoteSource = Model.RemoteSource = function(_config) {
+ Source.call(this, _config);
+};
-Model.RemoteSource.prototype = new Model.Source();
+extendPrototype(RemoteSource, Source);
-Model.RemoteSource.prototype.get = function() {
- this.status = Model._SOURCE_STATUS_WAITING;
+RemoteSource.prototype.get = function() {
+ this.status = _SOURCE_STATUS_WAITING;
var _this = this,
urlparams = this.url_params || {},
- dataType = (Model.isLocalURL(this.url) ? "json" : "jsonp");
+ dataType = (isLocalURL(this.url) ? "json" : "jsonp");
urlparams.format = dataType;
ns.jQuery.ajax({
url: this.url,
@@ -1139,51 +1149,50 @@
_this.handleCallbacks();
}
});
-}
+};
/* */
-Model.Directory = function() {
+var Directory = Model.Directory = function() {
this.remoteSources = {};
this.elements = {};
-}
+};
-Model.Directory.prototype.remoteSource = function(_properties) {
+Directory.prototype.remoteSource = function(_properties) {
if (typeof _properties !== "object" || typeof _properties.url === "undefined") {
- throw "Error : Model.Directory.remoteSource(configuration): configuration.url is undefined";
+ throw "Error : Directory.remoteSource(configuration): configuration.url is undefined";
}
var _config = ns._({ directory: this }).extend(_properties);
_config.url_params = _config.url_params || {};
var _hash = _config.url + "?" + ns.jQuery.param(_config.url_params);
if (typeof this.remoteSources[_hash] === "undefined") {
- this.remoteSources[_hash] = new Model.RemoteSource(_config);
+ this.remoteSources[_hash] = new RemoteSource(_config);
}
return this.remoteSources[_hash];
-}
+};
-Model.Directory.prototype.newLocalSource = function(_properties) {
+Directory.prototype.newLocalSource = function(_properties) {
var _config = ns._({ directory: this }).extend(_properties),
- _res = new Model.Source(_config);
+ _res = new Source(_config);
return _res;
-}
+};
-Model.Directory.prototype.getElement = function(_id) {
+Directory.prototype.getElement = function(_id) {
return this.elements[_id];
-}
+};
-Model.Directory.prototype.addElement = function(_element) {
+Directory.prototype.addElement = function(_element) {
this.elements[_element.id] = _element;
-}
+};
-Model.Directory.prototype.getGlobalList = function() {
- var _res = new Model.List(this);
+Directory.prototype.getGlobalList = function() {
+ var _res = new List(this);
_res.addIds(ns._(this.elements).keys());
return _res;
-}
-
+};
return Model;
})(IriSP);
-/* END model.js */
+/* END js */
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/serializers/ldt.js
--- a/src/js/serializers/ldt.js Tue Apr 23 15:23:20 2013 +0200
+++ b/src/js/serializers/ldt.js Wed May 15 15:35:15 2013 +0200
@@ -1,7 +1,7 @@
/* LDT Platform Serializer */
if (typeof IriSP.serializers === "undefined") {
- IriSP.serializers = {}
+ IriSP.serializers = {};
}
IriSP.serializers.ldt = {
@@ -281,5 +281,6 @@
_source.currentMedia = _source.getElement(_data.meta.main_media["id-ref"]);
}
}
-}
+};
+/* End of LDT Platform Serializer */
\ No newline at end of file
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/serializers/ldt_annotate.js
--- a/src/js/serializers/ldt_annotate.js Tue Apr 23 15:23:20 2013 +0200
+++ b/src/js/serializers/ldt_annotate.js Wed May 15 15:35:15 2013 +0200
@@ -1,7 +1,7 @@
-/* Used when Putting annotations on the platform */
+/* ldt_annotate serializer: Used when Putting annotations on the platform */
if (typeof IriSP.serializers === "undefined") {
- IriSP.serializers = {}
+ IriSP.serializers = {};
}
IriSP.serializers.ldt_annotate = {
@@ -72,4 +72,6 @@
_source.addList('annotation', new IriSP.Model.List(_source.directory));
this.deserializeAnnotation(_data, _source);
}
-}
\ No newline at end of file
+};
+
+/* End ldt_annotate serializer */
\ No newline at end of file
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/utils.js
--- a/src/js/utils.js Tue Apr 23 15:23:20 2013 +0200
+++ b/src/js/utils.js Wed May 15 15:35:15 2013 +0200
@@ -2,7 +2,7 @@
IriSP.jqEscape = function(_text) {
return _text.replace(/(:|\.)/g,'\\$1');
-}
+};
IriSP.getLib = function(lib) {
if (IriSP.libFiles.useCdn && typeof IriSP.libFiles.cdn[lib] == "string") {
@@ -27,7 +27,7 @@
}).appendTo('head');
IriSP._cssCache.push(_cssFile);
}
-}
+};
IriSP.textFieldHtml = function(_text, _regexp, _extend) {
var list = [],
@@ -100,13 +100,13 @@
return res;
-}
+};
IriSP.log = function() {
if (typeof console !== "undefined" && typeof IriSP.logging !== "undefined" && IriSP.logging) {
console.log.apply(console, arguments);
}
-}
+};
IriSP.attachDndData = function(jqSel, data) {
jqSel.attr("draggable", "true").on("dragstart", function(_event) {
@@ -121,4 +121,4 @@
_event.originalEvent.dataTransfer.setData("Text", JSON.stringify(d));
}
});
-}
+};
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/widgets-container/defaults.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/js/widgets-container/defaults.js Wed May 15 15:35:15 2013 +0200
@@ -0,0 +1,108 @@
+IriSP.language = 'en';
+
+IriSP.libFiles = {
+ defaultDir : "js/libs/",
+ inDefaultDir : {
+ underscore : "underscore-min.js",
+ Mustache : "mustache.js",
+ jQuery : "jquery.min.js",
+ jQueryUI : "jquery-ui.min.js",
+ swfObject : "swfobject.js",
+ cssjQueryUI : "jquery-ui.css",
+ popcorn : "popcorn-complete.min.js",
+ jwplayer : "jwplayer.js",
+ raphael : "raphael-min.js",
+ tracemanager : "tracemanager.js",
+ jwPlayerSWF : "player.swf",
+ json : "json2.js",
+ zeroClipboardJs: "ZeroClipboard.js",
+ zeroClipboardSwf: "ZeroClipboard.swf",
+ backbone: "backbone.js",
+ backboneRelational: "backbone-relational.js",
+ paper: "paper.js",
+ jqueryMousewheel: "jquery.mousewheel.min.js",
+ renkanPublish: "renkan.js",
+ processing: "processing-1.3.6.min.js",
+ recordMicSwf: "record_mic.swf"
+ },
+ locations : {
+ // use to define locations outside default_dir
+ },
+ cdn : {
+ jQuery : "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.7.2.min.js",
+ jQueryUI : "http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.22/jquery-ui.min.js",
+ swfObject : "http://ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js",
+ cssjQueryUI : "http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.22/themes/ui-lightness/jquery-ui.css",
+ underscore : "http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.3.3/underscore-min.js",
+ Mustache : "http://cdnjs.cloudflare.com/ajax/libs/mustache.js/0.5.0-dev/mustache.min.js",
+ raphael : "http://cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js",
+ json : "http://cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js",
+ popcorn: "http://cdn.popcornjs.org/code/dist/popcorn-complete.min.js"
+ },
+ useCdn : false
+}
+
+IriSP.widgetsDir = 'widgets';
+
+IriSP.widgetsRequirements = {
+ PopcornPlayer: {
+ noCss: true,
+ requires: [ "popcorn" ]
+ },
+ HtmlPlayer: {
+ noCss: true
+ },
+ JwpPlayer: {
+ noCss: true,
+ requires: [ "jwplayer" ]
+ },
+ DailymotionPlayer: {
+ noCss: true,
+ requires: [ "swfObject" ]
+ },
+ AdaptivePlayer: {
+ noCss: true
+ },
+ AutoPlayer: {
+ noCss: true
+ },
+ AnnotationsList: {
+ requires: [ "jwplayer" ]
+ },
+ Sparkline: {
+ noCss: true,
+ requires: [ "raphael" ]
+ },
+ Arrow: {
+ noCss: true,
+ requires: [ "raphael" ]
+ },
+ Mediafragment: {
+ noCss: true
+ },
+ Trace : {
+ noCss: true,
+ requires: [ "tracemanager" ]
+ },
+ Slideshare: {
+ requires: [ "swfObject" ]
+ },
+ Social: {
+ requires: [ "zeroClipboardJs" ]
+ },
+ Renkan: {
+ requires: [ "backbone", "backboneRelational", "paper", "jqueryMousewheel", "renkanPublish" ]
+ },
+ KnowledgeConcierge: {
+ requires: [ "processing" ]
+ },
+ MultiSegments: {
+ noCss: true
+ }
+}
+
+IriSP.guiDefaults = {
+ width : 640,
+ container : 'LdtPlayer',
+ spacer_div_height : 0
+}
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/widgets-container/metadataplayer.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/js/widgets-container/metadataplayer.js Wed May 15 15:35:15 2013 +0200
@@ -0,0 +1,193 @@
+/* widgets-container/metadataplayer.js - initialization and configuration of the widgets
+*/
+
+/* The Metadataplayer Object, single point of entry, replaces IriSP.init_player */
+
+IriSP.Metadataplayer = function(config) {
+ IriSP.log("IriSP.Metadataplayer constructor");
+ for (var key in IriSP.guiDefaults) {
+ if (IriSP.guiDefaults.hasOwnProperty(key) && !config.hasOwnProperty(key)) {
+ config[key] = IriSP.guiDefaults[key]
+ }
+ }
+ var _container = document.getElementById(config.container);
+ _container.innerHTML = '
Loading... Chargement...
';
+ this.sourceManager = new IriSP.Model.Directory();
+ this.config = config;
+ this.__events = {};
+ this.loadLibs();
+};
+
+IriSP.Metadataplayer.prototype.toString = function() {
+ return 'Metadataplayer in #' + this.config.container;
+};
+
+IriSP.Metadataplayer.prototype.on = function(_event, _callback) {
+ if (typeof this.__events[_event] === "undefined") {
+ this.__events[_event] = [];
+ }
+ this.__events[_event].push(_callback);
+};
+
+IriSP.Metadataplayer.prototype.trigger = function(_event, _data) {
+ var _element = this;
+ IriSP._(this.__events[_event]).each(function(_callback) {
+ _callback.call(_element, _data);
+ });
+};
+
+IriSP.Metadataplayer.prototype.loadLibs = function() {
+ IriSP.log("IriSP.Metadataplayer.prototype.loadLibs");
+ var $L = $LAB
+ .script(IriSP.getLib("underscore"))
+ .script(IriSP.getLib("Mustache"))
+ .script(IriSP.getLib("jQuery"));
+
+ if (typeof JSON == "undefined") {
+ $L.script(IriSP.getLib("json"));
+ }
+
+ $L.wait()
+ .script(IriSP.getLib("jQueryUI"));
+
+ /* widget specific requirements */
+ for(var _i = 0; _i < this.config.widgets.length; _i++) {
+ var _t = this.config.widgets[_i].type;
+ if (typeof IriSP.widgetsRequirements[_t] !== "undefined" && typeof IriSP.widgetsRequirements[_t].requires !== "undefined" ) {
+ for (var _j = 0; _j < IriSP.widgetsRequirements[_t].requires.length; _j++) {
+ $L.script(IriSP.getLib(IriSP.widgetsRequirements[_t].requires[_j]));
+ }
+ }
+ }
+
+ var _this = this;
+
+ $L.wait(function() {
+ _this.onLibsLoaded();
+ });
+};
+
+IriSP.Metadataplayer.prototype.onLibsLoaded = function() {
+ IriSP.log("IriSP.Metadataplayer.prototype.onLibsLoaded");
+ if (typeof IriSP.jQuery === "undefined" && typeof window.jQuery !== "undefined") {
+ IriSP.jQuery = window.jQuery;
+ }
+ if (typeof IriSP._ === "undefined" && typeof window._ !== "undefined") {
+ IriSP._ = window._;
+ }
+ IriSP.loadCss(IriSP.getLib("cssjQueryUI"));
+ IriSP.loadCss(this.config.css);
+
+ this.$ = IriSP.jQuery('#' + this.config.container);
+ this.$.css({
+ "width": this.config.width,
+ "clear": "both"
+ });
+ if (typeof this.config.height !== "undefined") {
+ this.$.css("height", this.config.height);
+ }
+
+ this.widgets = [];
+ var _this = this;
+ IriSP._(this.config.widgets).each(function(widgetconf, key) {
+ _this.widgets.push(null);
+ _this.loadWidget(widgetconf, function(widget) {
+ _this.widgets[key] = widget;
+ if (widget.isLoaded()) {
+ _this.trigger("widget-loaded");
+ }
+ });
+ });
+ this.$.find('.Ldt-Loader').detach();
+
+ this.widgetsLoaded = false;
+
+ this.on("widget-loaded", function() {
+ if (_this.widgetsLoaded) {
+ return;
+ }
+ var isloaded = !IriSP._(_this.widgets).any(function(w) {
+ return !(w && w.isLoaded())
+ });
+ if (isloaded) {
+ _this.widgetsLoaded = true;
+ _this.trigger("widgets-loaded");
+ }
+ });
+};
+
+IriSP.Metadataplayer.prototype.loadMetadata = function(_metadataInfo) {
+ if (_metadataInfo.elementType === "source") {
+ return _metadataInfo;
+ }
+ if (typeof _metadataInfo.serializer === "undefined" && typeof _metadataInfo.format !== "undefined") {
+ _metadataInfo.serializer = IriSP.serializers[_metadataInfo.format];
+ }
+ if (typeof _metadataInfo.url !== "undefined" && typeof _metadataInfo.serializer !== "undefined") {
+ return this.sourceManager.remoteSource(_metadataInfo);
+ } else {
+ return this.sourceManager.newLocalSource(_metadataInfo);
+ }
+};
+
+IriSP.Metadataplayer.prototype.loadWidget = function(_widgetConfig, _callback) {
+ /* Creating containers if needed */
+ if (typeof _widgetConfig.container === "undefined") {
+ var _divs = this.layoutDivs(_widgetConfig.type);
+ _widgetConfig.container = _divs[0];
+ }
+
+ var _this = this;
+
+ if (typeof IriSP.Widgets[_widgetConfig.type] !== "undefined") {
+ IriSP._.defer(function() {
+ _callback(new IriSP.Widgets[_widgetConfig.type](_this, _widgetConfig));
+ });
+ } else {
+ /* Loading Widget CSS */
+ if (typeof IriSP.widgetsRequirements[_widgetConfig.type] === "undefined" || typeof IriSP.widgetsRequirements[_widgetConfig.type].noCss === "undefined" || !IriSP.widgetsRequirements[_widgetConfig.type].noCss) {
+ IriSP.loadCss(IriSP.widgetsDir + '/' + _widgetConfig.type + '.css');
+ }
+ /* Loading Widget JS */
+ $LAB.script(IriSP.widgetsDir + '/' + _widgetConfig.type + '.js').wait(function() {
+ _callback(new IriSP.Widgets[_widgetConfig.type](_this, _widgetConfig));
+ });
+ }
+};
+
+/** create a subdiv with an unique id, and a spacer div as well.
+ @param widgetName the name of the widget.
+ @return an array of the form [createdivId, spacerdivId].
+*/
+IriSP.Metadataplayer.prototype.layoutDivs = function(_name, _height) {
+ if (typeof(_name) === "undefined") {
+ _name = "";
+ }
+ var newDiv = IriSP._.uniqueId(this.config.container + "_widget_" + _name + "_"),
+ spacerDiv = IriSP._.uniqueId("LdtPlayer_spacer_"),
+ divHtml = IriSP.jQuery('
')
+ .attr("id",newDiv)
+ .css({
+ width: this.config.width + "px",
+ position: "relative",
+ clear: "both"
+ }),
+ spacerHtml = IriSP.jQuery('
')
+ .attr("id",spacerDiv)
+ .css({
+ width: this.config.width + "px",
+ height: this.config.spacer_div_height + "px",
+ position: "relative",
+ clear: "both"
+ });
+ if (typeof _height !== "undefined") {
+ divHtml.css("height", _height);
+ }
+
+ this.$.append(divHtml);
+ this.$.append(spacerHtml);
+
+ return [newDiv, spacerDiv];
+};
+
+/* End of widgets-container/metadataplayer.js */
\ No newline at end of file
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/widgets-container/widget.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/js/widgets-container/widget.js Wed May 15 15:35:15 2013 +0200
@@ -0,0 +1,196 @@
+/* widgetsDefinition of an ancestor for the Widget classes */
+
+if (typeof IriSP.Widgets === "undefined") {
+ IriSP.Widgets = {};
+}
+
+/**
+ * @class IriSP.Widget is an "abstract" class. It's mostly used to define some properties common to every widget.
+ *
+ * Note that widget constructors are never called directly by the user. Instead, the widgets are instantiated by functions
+ * defined in init.js
+ *
+ * @constructor
+ * @param player - a reference to the player widget
+ * @param config - configuration options for the widget
+ */
+
+
+IriSP.Widgets.Widget = function(player, config) {
+
+ if( typeof player === "undefined") {
+ /* Probably an abstract call of the class when
+ * individual widgets set their prototype */
+ return;
+ }
+
+ this.__subwidgets = [];
+
+ /* Setting all the configuration options */
+ var _type = config.type,
+ _config = IriSP._.defaults({}, config, player.config.default_options, this.defaults),
+ _this = this;
+
+ IriSP._(_config).forEach(function(_value, _key) {
+ _this[_key] = _value;
+ });
+
+ this.$ = IriSP.jQuery('#' + this.container);
+
+ if (typeof this.width === "undefined") {
+ this.width = this.$.width();
+ } else {
+ this.$.css("width", this.width);
+ }
+
+ if (typeof this.height !== "undefined") {
+ this.$.css("height", this.height);
+ }
+
+ /* Setting this.player at the end in case it's been overriden
+ * by a configuration option of the same name :-(
+ */
+ this.player = player;
+
+ /* Adding classes and html attributes */
+ this.$.addClass("Ldt-TraceMe Ldt-Widget").attr("widget-type", _type);
+
+ this.l10n = (
+ typeof this.messages[IriSP.language] !== "undefined"
+ ? this.messages[IriSP.language]
+ : (
+ IriSP.language.length > 2 && typeof this.messages[IriSP.language.substr(0,2)] !== "undefined"
+ ? this.messages[IriSP.language.substr(0,2)]
+ : this.messages["en"]
+ )
+ );
+
+ /* Loading Metadata if required */
+
+ if (this.metadata) {
+ /* Getting metadata */
+ this.source = player.loadMetadata(this.metadata);
+
+ /* Call draw when loaded */
+ this.source.onLoad(function() {
+ if (_this.media_id) {
+ _this.media = this.getElement(_this.media_id);
+ } else {
+ var _mediaopts = {
+ is_mashup: _this.is_mashup || false
+ }
+ _this.media = this.getCurrentMedia(_mediaopts);
+ }
+
+ _this.draw();
+ player.trigger("widget-loaded");
+ });
+ } else {
+ this.draw();
+ }
+
+
+};
+
+IriSP.Widgets.Widget.prototype.defaults = {};
+
+IriSP.Widgets.Widget.prototype.template = '';
+
+IriSP.Widgets.Widget.prototype.messages = {"en":{}};
+
+IriSP.Widgets.Widget.prototype.templateToHtml = function(_template) {
+ return Mustache.to_html(_template, this);
+};
+
+IriSP.Widgets.Widget.prototype.renderTemplate = function() {
+ this.$.append(this.templateToHtml(this.template));
+};
+
+IriSP.Widgets.Widget.prototype.functionWrapper = function(_name) {
+ var _this = this,
+ _function = this[_name];
+ if (typeof _function !== "undefined") {
+ return function() {
+ return _function.apply(_this, Array.prototype.slice.call(arguments, 0));
+ }
+ } else {
+ console.log("Error, Unknown function IriSP.Widgets." + this.type + "." + _name)
+ }
+};
+
+IriSP.Widgets.Widget.prototype.getFunctionOrName = function(_functionOrName) {
+ switch (typeof _functionOrName) {
+ case "function":
+ return _functionOrName;
+ case "string":
+ return this.functionWrapper(_functionOrName);
+ default:
+ return undefined;
+ }
+};
+
+IriSP.Widgets.Widget.prototype.onMdpEvent = function(_eventName, _functionOrName) {
+ this.player.on(_eventName, this.getFunctionOrName(_functionOrName));
+};
+
+IriSP.Widgets.Widget.prototype.onMediaEvent = function(_eventName, _functionOrName) {
+ this.media.on(_eventName, this.getFunctionOrName(_functionOrName));
+};
+
+IriSP.Widgets.Widget.prototype.getWidgetAnnotations = function() {
+ if (typeof this.annotation_type === "undefined") {
+ return this.media.getAnnotations();
+ }
+ if (this.annotation_type.elementType === "annotationType") {
+ return this.annotation_type.getAnnotations();
+ }
+ return this.media.getAnnotationsByTypeTitle(this.annotation_type);
+};
+
+IriSP.Widgets.Widget.prototype.getWidgetAnnotationsAtTime = function() {
+ var _time = this.media.getCurrentTime();
+ return this.getWidgetAnnotations().filter(function(_annotation) {
+ return _annotation.begin <= _time && _annotation.end > _time;
+ });
+};
+
+IriSP.Widgets.Widget.prototype.isLoaded = function() {
+ var isloaded = !IriSP._(this.__subwidgets).any(function(w) {
+ return !(w && w.isLoaded());
+ });
+ return isloaded;
+};
+
+IriSP.Widgets.Widget.prototype.insertSubwidget = function(_selector, _widgetoptions, _propname) {
+ var _id = _selector.attr("id"),
+ _this = this,
+ _type = _widgetoptions.type,
+ $L = $LAB,
+ key = this.__subwidgets.length;
+ this.__subwidgets.push(null);
+ if (typeof _id == "undefined") {
+ _id = IriSP._.uniqueId(this.container + '_sub_widget_' + _widgetoptions.type);
+ _selector.attr("id", _id);
+ }
+ _widgetoptions.container = _id;
+ if (typeof IriSP.widgetsRequirements[_type] !== "undefined" && typeof IriSP.widgetsRequirements[_type].requires !== "undefined" ) {
+ for (var _j = 0; _j < IriSP.widgetsRequirements[_type].requires.length; _j++) {
+ $L.script(IriSP.getLib(IriSP.widgetsRequirements[_type].requires[_j]));
+ }
+ }
+ $L.wait(function() {
+ _this.player.loadWidget(_widgetoptions, function(_widget) {
+ if (_propname) {
+ _this[_propname] = _widget;
+ }
+ _this.__subwidgets[key] = _widget;
+ });
+ });
+};
+
+/**
+ * This method responsible of drawing a widget on screen.
+ */
+IriSP.Widgets.Widget.prototype.draw = function() {
+ /* implemented by "sub-classes" */
+};
\ No newline at end of file
diff -r 1615c7e4ef9d -r 9521347ede1d src/js/widgets.js
--- a/src/js/widgets.js Tue Apr 23 15:23:20 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +0,0 @@
-/* Definition of an ancestor for the Widget classes */
-
-if (typeof IriSP.Widgets === "undefined") {
- IriSP.Widgets = {}
-}
-
-/**
- * @class IriSP.Widget is an "abstract" class. It's mostly used to define some properties common to every widget.
- *
- * Note that widget constructors are never called directly by the user. Instead, the widgets are instantiated by functions
- * defined in init.js
- *
- * @constructor
- * @param player - a reference to the player widget
- * @param config - configuration options for the widget
- */
-
-
-IriSP.Widgets.Widget = function(player, config) {
-
- if( typeof player === "undefined") {
- /* Probably an abstract call of the class when
- * individual widgets set their prototype */
- return;
- }
-
- this.__subwidgets = [];
-
- /* Setting all the configuration options */
- var _type = config.type,
- _config = IriSP._.defaults({}, config, player.config.default_options, this.defaults),
- _this = this;
-
- IriSP._(_config).forEach(function(_value, _key) {
- _this[_key] = _value;
- });
-
- this.$ = IriSP.jQuery('#' + this.container);
-
- if (typeof this.width === "undefined") {
- this.width = this.$.width();
- } else {
- this.$.css("width", this.width);
- }
-
- if (typeof this.height !== "undefined") {
- this.$.css("height", this.height);
- }
-
- /* Setting this.player at the end in case it's been overriden
- * by a configuration option of the same name :-(
- */
- this.player = player;
-
- /* Adding classes and html attributes */
- this.$.addClass("Ldt-TraceMe Ldt-Widget").attr("widget-type", _type);
-
- this.l10n = (
- typeof this.messages[IriSP.language] !== "undefined"
- ? this.messages[IriSP.language]
- : (
- IriSP.language.length > 2 && typeof this.messages[IriSP.language.substr(0,2)] !== "undefined"
- ? this.messages[IriSP.language.substr(0,2)]
- : this.messages["en"]
- )
- );
-
- /* Loading Metadata if required */
-
- if (this.metadata) {
- /* Getting metadata */
- this.source = player.loadMetadata(this.metadata);
-
- /* Call draw when loaded */
- this.source.onLoad(function() {
- if (_this.media_id) {
- _this.media = this.getElement(_this.media_id);
- } else {
- var _mediaopts = {
- is_mashup: _this.is_mashup || false
- }
- _this.media = this.getCurrentMedia(_mediaopts);
- }
-
- _this.draw();
- player.trigger("widget-loaded");
- });
- } else {
- this.draw();
- }
-
-
-};
-
-IriSP.Widgets.Widget.prototype.defaults = {}
-
-IriSP.Widgets.Widget.prototype.template = '';
-
-IriSP.Widgets.Widget.prototype.messages = {"en":{}};
-
-IriSP.Widgets.Widget.prototype.templateToHtml = function(_template) {
- return Mustache.to_html(_template, this);
-}
-
-IriSP.Widgets.Widget.prototype.renderTemplate = function() {
- this.$.append(this.templateToHtml(this.template));
-}
-
-IriSP.Widgets.Widget.prototype.functionWrapper = function(_name) {
- var _this = this,
- _function = this[_name];
- if (typeof _function !== "undefined") {
- return function() {
- return _function.apply(_this, Array.prototype.slice.call(arguments, 0));
- }
- } else {
- console.log("Error, Unknown function IriSP.Widgets." + this.type + "." + _name)
- }
-}
-
-IriSP.Widgets.Widget.prototype.getFunctionOrName = function(_functionOrName) {
- switch (typeof _functionOrName) {
- case "function":
- return _functionOrName;
- case "string":
- return this.functionWrapper(_functionOrName);
- default:
- return undefined;
- }
-}
-
-IriSP.Widgets.Widget.prototype.onMdpEvent = function(_eventName, _functionOrName) {
- this.player.on(_eventName, this.getFunctionOrName(_functionOrName));
-}
-
-IriSP.Widgets.Widget.prototype.onMediaEvent = function(_eventName, _functionOrName) {
- this.media.on(_eventName, this.getFunctionOrName(_functionOrName));
-}
-
-IriSP.Widgets.Widget.prototype.getWidgetAnnotations = function() {
- if (typeof this.annotation_type === "undefined") {
- return this.media.getAnnotations();
- }
- if (this.annotation_type.elementType === "annotationType") {
- return this.annotation_type.getAnnotations();
- }
- return this.media.getAnnotationsByTypeTitle(this.annotation_type);
-}
-
-IriSP.Widgets.Widget.prototype.getWidgetAnnotationsAtTime = function() {
- var _time = this.media.getCurrentTime();
- return this.getWidgetAnnotations().filter(function(_annotation) {
- return _annotation.begin <= _time && _annotation.end > _time;
- });
-}
-
-IriSP.Widgets.Widget.prototype.isLoaded = function() {
- var isloaded = !IriSP._(this.__subwidgets).any(function(w) {
- return !(w && w.isLoaded());
- });
- return isloaded;
-}
-
-IriSP.Widgets.Widget.prototype.insertSubwidget = function(_selector, _widgetoptions, _propname) {
- var _id = _selector.attr("id"),
- _this = this,
- _type = _widgetoptions.type,
- $L = $LAB,
- key = this.__subwidgets.length;
- this.__subwidgets.push(null);
- if (typeof _id == "undefined") {
- _id = IriSP._.uniqueId(this.container + '_sub_widget_' + _widgetoptions.type);
- _selector.attr("id", _id);
- }
- _widgetoptions.container = _id;
- if (typeof IriSP.widgetsRequirements[_type] !== "undefined" && typeof IriSP.widgetsRequirements[_type].requires !== "undefined" ) {
- for (var _j = 0; _j < IriSP.widgetsRequirements[_type].requires.length; _j++) {
- $L.script(IriSP.getLib(IriSP.widgetsRequirements[_type].requires[_j]));
- }
- }
- $L.wait(function() {
- _this.player.loadWidget(_widgetoptions, function(_widget) {
- if (_propname) {
- _this[_propname] = _widget;
- }
- _this.__subwidgets[key] = _widget;
- });
- });
-}
-
-/**
- * This method responsible of drawing a widget on screen.
- */
-IriSP.Widgets.Widget.prototype.draw = function() {
- /* implemented by "sub-classes" */
-};
\ No newline at end of file
diff -r 1615c7e4ef9d -r 9521347ede1d src/widgets/HtmlPlayer.js
--- a/src/widgets/HtmlPlayer.js Tue Apr 23 15:23:20 2013 +0200
+++ b/src/widgets/HtmlPlayer.js Wed May 15 15:35:15 2013 +0200
@@ -10,118 +10,6 @@
IriSP.Widgets.HtmlPlayer.prototype.draw = function() {
-
- if (typeof this.video === "undefined") {
- this.video = this.media.video;
- }
-
- if (this.url_transform) {
- this.video = this.url_transform(this.video);
- }
-
- var videoEl = IriSP.jQuery('