' +
+ );
+ },
+ authors: function(author) {
+ // Todo: default author img to: https://dev.openlibrary.org/images/icons/avatar_author-lg.png
+ $('header#header-bar .search-component ul.search-results').append(
+ '
' +
author.name + '
'
- );
- }
+ );
}
+ }
- $('form.search-bar-input').submit(function(e) {
- q = $('header#header-bar .search-component .search-bar-input input').val();
- var facet_value = searchFacets[localStorage.getItem("facet")];
- if (facet_value === 'books') {
- $('header#header-bar .search-component .search-bar-input input[type=text]').val(marshalBookSearchQuery(q));
- }
- setMode('.search-bar-input');
- });
-
- $('.search-mode').change(function() {
- $('html,body').css('cursor', 'wait');
- setSearchMode($(this).val());
- if ($('.olform').length) {
- $('.olform').submit();
- } else {
- location.reload();
- }
- });
+ $('form.search-bar-input').submit(function(e) {
+ q = $('header#header-bar .search-component .search-bar-input input').val();
+ var facet_value = searchFacets[localStorage.getItem("facet")];
+ if (facet_value === 'books') {
+ $('header#header-bar .search-component .search-bar-input input[type=text]').val(marshalBookSearchQuery(q));
+ }
+ setMode('.search-bar-input');
+ });
- $('.olform').submit(function() {
- if (localStorage.getItem('mode') !== 'everything') {
- $('.olform').append('
');
- } if (localStorage.getItem('mode') === 'printdisabled') {
- $('.olform').append('
');
- }
+ $('.search-mode').change(function() {
+ $('html,body').css('cursor', 'wait');
+ setSearchMode($(this).val());
+ if ($('.olform').length) {
+ $('.olform').submit();
+ } else {
+ location.reload();
+ }
+ });
- });
+ $('.olform').submit(function() {
+ if (localStorage.getItem('mode') !== 'everything') {
+ $('.olform').append('
');
+ } if (localStorage.getItem('mode') === 'printdisabled') {
+ $('.olform').append('
');
+ }
- $('li.instant-result a').live('click', function() {
- $('html,body').css('cursor', 'wait');
- $(this).css('cursor', 'wait');
- });
+ });
- $('header#header-bar .search-component .search-results li a').live('click', debounce(function(event) {
- $(document.body).css({'cursor' : 'wait'});
- }, 300, false));
+ $('li.instant-result a').live('click', function() {
+ $('html,body').css('cursor', 'wait');
+ $(this).css('cursor', 'wait');
+ });
- $('header#header-bar .search-component .search-bar-input input').keyup(debounce(function(e) {
- // ignore directional keys and enter for callback
- if (![13,37,38,39,40].includes(e.keyCode)){
- renderInstantSearchResults($(this).val());
- }
- }, 500, false));
+ $('header#header-bar .search-component .search-results li a').live('click', debounce(function(event) {
+ $(document.body).css({'cursor' : 'wait'});
+ }, 300, false));
- $(document).click(debounce(function(event) {
- if(!$(event.target).closest('header#header-bar .search-component').length) {
- $('header#header-bar .search-component ul.search-results').empty();
- }
- if(!$(event.target).closest('header#header-bar .navigation-component .browse-menu').length) {
- $('header#header-bar .navigation-component .browse-menu .browse-menu-options').hide();
- }
- if(!$(event.target).closest('header#header-bar .navigation-component .my-books-menu').length) {
- $('header#header-bar .navigation-component .my-books-menu .my-books-menu-options').hide();
- }
- if(!$(event.target).closest('header#header-bar .navigation-component .more-menu').length) {
- $('header#header-bar .navigation-component .more-menu .more-menu-options').hide();
- }
- if(!$(event.target).closest('header#header-bar .hamburger-component .hamburger-button').length) {
- $('header#header-bar .hamburger-dropdown-component').hide();
- }
+ $('header#header-bar .search-component .search-bar-input input').keyup(debounce(function(e) {
+ // ignore directional keys and enter for callback
+ if (![13,37,38,39,40].includes(e.keyCode)){
+ renderInstantSearchResults($(this).val());
+ }
+ }, 500, false));
- if(!$(event.target).closest('.dropclick').length) {
- $('.dropclick').parent().next('.dropdown').slideUp(25);
- $('.dropclick').next('.dropdown').slideUp(25);
- $('.dropclick').parent().find('.arrow').removeClass("up");
- }
- }, 100, false));
-
- $('header#header-bar .search-component .search-bar-input input').focus(debounce(function() {
- var val = $(this).val();
- renderInstantSearchResults(val);
- }, 300, false));
-
- /* Browse menu */
- $('header#header-bar .navigation-component .browse-menu').click(debounce(function() {
- $('header#header-bar .navigation-component .browse-menu-options').toggle();
- }, 300, false));
-
- /* My Books menu */
- $('header#header-bar .navigation-component .my-books-menu').click(debounce(function() {
- $('header#header-bar .navigation-component .my-books-menu-options').toggle();
- }, 300, false));
-
- /* More menu */
- $('header#header-bar .navigation-component .more-menu').click(debounce(function() {
- $('header#header-bar .navigation-component .more-menu-options').toggle();
- }, 300, false));
-
- /* Hamburger menu */
- $('header#header-bar .hamburger-component .hamburger-button').live('click', debounce(function() {
- $('header#header-bar .hamburger-dropdown-component').toggle();
- }, 300, false));
-
- $('textarea.markdown').focus(function(){
- $('.wmd-preview').show();
- if ($("#prevHead").length == 0) {
- $('.wmd-preview').before('
Preview
');
- }
- });
- $('.dropclick').live('click', debounce(function(){
- $(this).next('.dropdown').slideToggle(25);
- $(this).parent().next('.dropdown').slideToggle(25);
- $(this).parent().find('.arrow').toggleClass("up");
- }, 300, false));
-
- $('a.add-to-list').live('click', debounce(function(){
- $(this).closest('.dropdown').slideToggle(25);
- $(this).closest('.arrow').toggleClass("up");
- }, 300, false));
-
- function hideUser(){
- $('#main-account-dropdown').slideUp(25);
- $('header#header-bar .dropdown-avatar').removeClass('hover');
- };
+ $(document).click(debounce(function(event) {
+ if(!$(event.target).closest('header#header-bar .search-component').length) {
+ $('header#header-bar .search-component ul.search-results').empty();
+ }
+ if(!$(event.target).closest('header#header-bar .navigation-component .browse-menu').length) {
+ $('header#header-bar .navigation-component .browse-menu .browse-menu-options').hide();
+ }
+ if(!$(event.target).closest('header#header-bar .navigation-component .my-books-menu').length) {
+ $('header#header-bar .navigation-component .my-books-menu .my-books-menu-options').hide();
+ }
+ if(!$(event.target).closest('header#header-bar .navigation-component .more-menu').length) {
+ $('header#header-bar .navigation-component .more-menu .more-menu-options').hide();
+ }
+ if(!$(event.target).closest('header#header-bar .hamburger-component .hamburger-button').length) {
+ $('header#header-bar .hamburger-dropdown-component').hide();
+ }
- $('header#header-bar .dropdown-avatar').click(debounce(function() {
- var dropdown = $('#main-account-dropdown');
- if (dropdown.is(':visible') === true) {
- hideUser();
- } else {
- dropdown.slideToggle(25);
- $(this).toggleClass('hover');
- var offUser = $(this);
- $(document).mouseup(function(offUser){
- if($(offUser.target).parent("a").length==0){
- hideUser()
- };
- });
+ if(!$(event.target).closest('.dropclick').length) {
+ $('.dropclick').parent().next('.dropdown').slideUp(25);
+ $('.dropclick').next('.dropdown').slideUp(25);
+ $('.dropclick').parent().find('.arrow').removeClass("up");
+ }
+ }, 100, false));
+
+ $('header#header-bar .search-component .search-bar-input input').focus(debounce(function() {
+ var val = $(this).val();
+ renderInstantSearchResults(val);
+ }, 300, false));
+
+ /* Browse menu */
+ $('header#header-bar .navigation-component .browse-menu').click(debounce(function() {
+ $('header#header-bar .navigation-component .browse-menu-options').toggle();
+ }, 300, false));
+
+ /* My Books menu */
+ $('header#header-bar .navigation-component .my-books-menu').click(debounce(function() {
+ $('header#header-bar .navigation-component .my-books-menu-options').toggle();
+ }, 300, false));
+
+ /* More menu */
+ $('header#header-bar .navigation-component .more-menu').click(debounce(function() {
+ $('header#header-bar .navigation-component .more-menu-options').toggle();
+ }, 300, false));
+
+ /* Hamburger menu */
+ $('header#header-bar .hamburger-component .hamburger-button').live('click', debounce(function() {
+ $('header#header-bar .hamburger-dropdown-component').toggle();
+ }, 300, false));
+
+ $('textarea.markdown').focus(function(){
+ $('.wmd-preview').show();
+ if ($("#prevHead").length == 0) {
+ $('.wmd-preview').before('
Preview
');
+ }
+ });
+ $('.dropclick').live('click', debounce(function(){
+ $(this).next('.dropdown').slideToggle(25);
+ $(this).parent().next('.dropdown').slideToggle(25);
+ $(this).parent().find('.arrow').toggleClass("up");
+ }, 300, false));
+
+ $('a.add-to-list').live('click', debounce(function(){
+ $(this).closest('.dropdown').slideToggle(25);
+ $(this).closest('.arrow').toggleClass("up");
+ }, 300, false));
+
+ function hideUser(){
+ $('#main-account-dropdown').slideUp(25);
+ $('header#header-bar .dropdown-avatar').removeClass('hover');
+ }
+
+ $('header#header-bar .dropdown-avatar').click(debounce(function() {
+ var dropdown = $('#main-account-dropdown');
+ if (dropdown.is(':visible') === true) {
+ hideUser();
+ } else {
+ dropdown.slideToggle(25);
+ $(this).toggleClass('hover');
+ var offUser = $(this);
+ $(document).mouseup(function(offUser){
+ if($(offUser.target).parent("a").length==0){
+ hideUser()
+ }
+ });
- }
- }, 100, false));
+ }
+ }, 100, false));
- var readStatuses = ["Remove", 'Want to Read', 'Currently Reading', 'Already Read'];
- var buildReadingLogCombo = function(status_id) {
- var template = function(shelf_id, checked, remove) {
- return '
';
+ var readStatuses = ["Remove", 'Want to Read', 'Currently Reading', 'Already Read'];
+ var buildReadingLogCombo = function(status_id) {
+ var template = function(shelf_id, checked, remove) {
+ return '
';
+ }
+ return (status_id == 3)? (template(3, true) + template(1) + template(2) + template(3, false, true)) :
+ (status_id == 2)? (template(2, true) + template(1) + template(3) + template(2, false, true)) :
+ (template(1, true) + template(2) + template(3) + template(1, false, true));
+ }
+
+ $('.reading-log-lite select').change(function(e) {
+ var self = this;
+ var form = $(self).closest("form");
+ var option = $(self).val();
+ var remove = $(self).children("option").filter(':selected').text().toLowerCase() === "remove";
+ var url = $(form).attr('action');
+ $.ajax({
+ 'url': url,
+ 'type': "POST",
+ 'data': {
+ bookshelf_id: $(self).val()
+ },
+ 'datatype': 'json',
+ success: function(data) {
+ if (remove) {
+ $(self).closest('.searchResultItem').remove();
+ } else {
+ location.reload();
}
- return (status_id == 3)? (template(3, true) + template(1) + template(2) + template(3, false, true)) :
- (status_id == 2)? (template(2, true) + template(1) + template(3) + template(2, false, true)) :
- (template(1, true) + template(2) + template(3) + template(1, false, true));
- }
-
- $('.reading-log-lite select').change(function(e) {
- var self = this;
- var form = $(self).closest("form");
- var option = $(self).val();
- var remove = $(self).children("option").filter(':selected').text().toLowerCase() === "remove";
- var url = $(form).attr('action');
- $.ajax({
- 'url': url,
- 'type': "POST",
- 'data': {
- bookshelf_id: $(self).val()
- },
- 'datatype': 'json',
- success: function(data) {
- if (remove) {
- $(self).closest('.searchResultItem').remove();
- } else {
- location.reload();
- }
- }
- });
- e.preventDefault();
+ }
});
+ e.preventDefault();
+ });
});
jQuery.fn.exists = function(){return jQuery(this).length>0;}
diff --git a/openlibrary/plugins/openlibrary/js/python.js b/openlibrary/plugins/openlibrary/js/python.js
index 82e12e069a9..f35f6a39722 100644
--- a/openlibrary/plugins/openlibrary/js/python.js
+++ b/openlibrary/plugins/openlibrary/js/python.js
@@ -1,10 +1,10 @@
function commify(n) {
- var text = n.toString();
- var re = /(\d+)(\d{3})/;
+ var text = n.toString();
+ var re = /(\d+)(\d{3})/;
- while (re.test(text)) {
- text = text.replace(re, "$1,$2");
- }
+ while (re.test(text)) {
+ text = text.replace(re, "$1,$2");
+ }
- return text;
+ return text;
}
diff --git a/openlibrary/plugins/openlibrary/js/subjects.js b/openlibrary/plugins/openlibrary/js/subjects.js
index b0f706983f8..2c6eb93bd07 100644
--- a/openlibrary/plugins/openlibrary/js/subjects.js
+++ b/openlibrary/plugins/openlibrary/js/subjects.js
@@ -12,12 +12,12 @@
// });
//
-;(function() {
+(function() {
-function Subject(data, options, callback) {
+ function Subject(data, options, callback) {
options = options || {};
var defaults = {
- pagesize: 12
+ pagesize: 12
}
this.settings = $.extend(defaults, options);
this.slug = data.name.replace(/\s+/g, '-').toLowerCase();
@@ -28,194 +28,194 @@ function Subject(data, options, callback) {
this.init(data);
this._data = data;
-}
+ }
-window.Subject = Subject;
+ window.Subject = Subject;
-// Implementation of Python urllib.urlencode in Javascript.
-function urlencode(query) {
+ // Implementation of Python urllib.urlencode in Javascript.
+ function urlencode(query) {
var parts = [];
for (var k in query) {
- parts.push(k + "=" + query[k]);
+ parts.push(k + "=" + query[k]);
}
return parts.join("&");
-}
+ }
-/* Should really use createElement() */
-function renderTag(tag, keyvals, child) {
+ /* Should really use createElement() */
+ function renderTag(tag, keyvals, child) {
var html = '<' + tag + ' ';
for (var key in keyvals) {
- var val = keyvals[key];
- if (val == '') {
- html += key + ' ';
- } else {
- html += key + '="' + val + '" ';
- }
+ var val = keyvals[key];
+ if (val == '') {
+ html += key + ' ';
+ } else {
+ html += key + '="' + val + '" ';
+ }
}
if (tag === 'img') {
- return html + '/>';
+ return html + '/>';
}
html += '>';
if (child) {
- html += child;
+ html += child;
}
html += '';
return html;
-}
+ }
-function slice(array, begin, end) {
+ function slice(array, begin, end) {
var a = [];
for (var i=begin; i < Math.min(array.length, end); i++) {
- a.push(array[i]);
+ a.push(array[i]);
}
return a;
-}
+ }
-$.extend(Subject.prototype, {
+ $.extend(Subject.prototype, {
init: function(data) {
- $.log(["init", this, arguments]);
+ $.log(["init", this, arguments]);
- $.extend(this, data);
- this.page_count = Math.ceil(this.work_count / this.settings.pagesize);
- this.epage_count = Math.ceil(this.ebook_count / this.settings.pagesize);
+ $.extend(this, data);
+ this.page_count = Math.ceil(this.work_count / this.settings.pagesize);
+ this.epage_count = Math.ceil(this.ebook_count / this.settings.pagesize);
- // cache already visited pages
- //@@ Can't this be handled by HTTP caching?
- this._pages = {};
- if (this.has_fulltext != "true")
- this._pages[0] = {"works": slice(data.works, 0, this.settings.pagesize)};
+ // cache already visited pages
+ //@@ Can't this be handled by HTTP caching?
+ this._pages = {};
+ if (this.has_fulltext != "true")
+ this._pages[0] = {"works": slice(data.works, 0, this.settings.pagesize)};
- // TODO: initialize additional pages when there are more works.
+ // TODO: initialize additional pages when there are more works.
},
bind: function(name, callback) {
- $(this).bind(name, callback);
+ $(this).bind(name, callback);
},
getPageCount: function() {
- return this.has_fulltext == "true"? this.epage_count : this.page_count;
+ return this.has_fulltext == "true"? this.epage_count : this.page_count;
},
renderWork: function(work) {
- var ia = work.lending_identifier;
- var authors = [];
- for (var author in work.authors)
- authors.push(work.authors[author].name);
- var ed = 'edition' + (work.edition_count > 1 ? 's' : '');
- var titlestring = work.title + " by " + authors.join(', ') +
+ var ia = work.lending_identifier;
+ var authors = [];
+ for (var author in work.authors)
+ authors.push(work.authors[author].name);
+ var ed = 'edition' + (work.edition_count > 1 ? 's' : '');
+ var titlestring = work.title + " by " + authors.join(', ') +
' (' + work.edition_count + ' ' + ed + ')';
- var bookcover_url = '//covers.openlibrary.org/b/id/' + work.cover_id + '-M.jpg';
- var format = work.public_scan ? 'public' : (work.printdisabled && !work.ia_collection.includes('inlibrary')) ? 'daisy' : 'borrow';
- var bookread_url = work.public_scan ?
- ('//archive.org/stream/' + work.ia + '?ref=ol') :
- '/borrow/ia/' + work.ia;
- var html = renderTag('div', {'class': 'coverMagic'},
- renderTag('span', {
- 'itemtype': 'https://schema.org/Book',
- 'itemscope': ''},
- renderTag('div', {'class': 'SRPCover'},
- renderTag('a', {'href': work.key, 'title': titlestring,
- 'data-ol-link-track': 'subject-' + this.slug},
- renderTag('img', {'src': bookcover_url, 'itemprop': 'image',
- 'alt': titlestring, 'class': 'cover'}))) +
+ var bookcover_url = '//covers.openlibrary.org/b/id/' + work.cover_id + '-M.jpg';
+ var format = work.public_scan ? 'public' : (work.printdisabled && !work.ia_collection.includes('inlibrary')) ? 'daisy' : 'borrow';
+ var bookread_url = work.public_scan ?
+ ('//archive.org/stream/' + work.ia + '?ref=ol') :
+ '/borrow/ia/' + work.ia;
+ var html = renderTag('div', {'class': 'coverMagic'},
+ renderTag('span', {
+ 'itemtype': 'https://schema.org/Book',
+ 'itemscope': ''},
+ renderTag('div', {'class': 'SRPCover'},
+ renderTag('a', {'href': work.key, 'title': titlestring,
+ 'data-ol-link-track': 'subject-' + this.slug},
+ renderTag('img', {'src': bookcover_url, 'itemprop': 'image',
+ 'alt': titlestring, 'class': 'cover'}))) +
renderTag('div', {'class': 'coverEbook'},
(format === 'public' ?
- renderTag('a', {'href': bookread_url, "title": "Read online",
- 'class': 'borrow_available cta-btn'}, 'Read') :
- renderTag('a', {
- 'href': bookread_url,
- 'title': 'Read this book',
- 'class': 'borrow-link',
- 'data-ocaid': work.ia,
- 'data-key': work.key
+ renderTag('a', {'href': bookread_url, "title": "Read online",
+ 'class': 'borrow_available cta-btn'}, 'Read') :
+ renderTag('a', {
+ 'href': bookread_url,
+ 'title': 'Read this book',
+ 'class': 'borrow-link',
+ 'data-ocaid': work.ia,
+ 'data-key': work.key
})))));
- return html;
+ return html;
},
loadPage: function(pagenum, callback) {
- var offset = pagenum * this.settings.pagesize;
- var limit = this.settings.pagesize;
-
- if (offset > this.bookCount) {
- callback && callback([]);
- }
-
- if (this._pages[pagenum]) {
- callback(this._pages[pagenum]);
+ var offset = pagenum * this.settings.pagesize;
+ var limit = this.settings.pagesize;
+
+ if (offset > this.bookCount) {
+ callback && callback([]);
+ }
+
+ if (this._pages[pagenum]) {
+ callback(this._pages[pagenum]);
+ }
+ else {
+ var page = this;
+
+ var params = {
+ "limit": limit,
+ "offset": offset,
+ "has_fulltext": this.has_fulltext,
+ "sort": this.sort
}
- else {
- var page = this;
-
- var params = {
- "limit": limit,
- "offset": offset,
- "has_fulltext": this.has_fulltext,
- "sort": this.sort
- }
- if(this.published_in) {
- params.published_in = this.published_in;
- }
- $.extend(params, this.filter);
-
- key = this.key.replace(/\s+/g, '_');
- var url = key + ".json?" + urlencode(params);
- var t = this;
-
- $.getJSON(url, function(data) {
- t._pages[pagenum] = data;
- callback(data);
- });
+ if(this.published_in) {
+ params.published_in = this.published_in;
}
- },
+ $.extend(params, this.filter);
- _ajax: function(params, callback) {
- params = $.extend({"limit": this.settings.pagesize, "offset": 0},
- this.filter, params);
key = this.key.replace(/\s+/g, '_');
var url = key + ".json?" + urlencode(params);
- $.getJSON(url, callback);
+ var t = this;
+
+ $.getJSON(url, function(data) {
+ t._pages[pagenum] = data;
+ callback(data);
+ });
+ }
+ },
+
+ _ajax: function(params, callback) {
+ params = $.extend({"limit": this.settings.pagesize, "offset": 0},
+ this.filter, params);
+ key = this.key.replace(/\s+/g, '_');
+ var url = key + ".json?" + urlencode(params);
+ $.getJSON(url, callback);
},
setFilter: function(filter, callback) {
- for (var k in filter) {
- if (filter[k] == null) {
- delete filter[k];
- }
+ for (var k in filter) {
+ if (filter[k] == null) {
+ delete filter[k];
}
- this.filter = filter;
-
- var _this = this;
- this._ajax({"details": "true"}, function(data) {
- _this.init(data);
- callback && callback();
- });
+ }
+ this.filter = filter;
+
+ var _this = this;
+ this._ajax({"details": "true"}, function(data) {
+ _this.init(data);
+ callback && callback();
+ });
},
setSort: function(sort_order) {
- if (this.sort == sort_order) {
- return; // shouldn't happen
- }
- this.sort = sort_order;
- this._pages = {};
+ if (this.sort == sort_order) {
+ return; // shouldn't happen
+ }
+ this.sort = sort_order;
+ this._pages = {};
},
setFulltext: function(has_fulltext) {
- if (this.has_fulltext == has_fulltext) {
- return;
- }
- this.has_fulltext = has_fulltext;
- this._pages = {};
+ if (this.has_fulltext == has_fulltext) {
+ return;
+ }
+ this.has_fulltext = has_fulltext;
+ this._pages = {};
},
addFilter: function(filter, callback) {
- this.setFilter($.extend({}, this.filter, filter), callback);
+ this.setFilter($.extend({}, this.filter, filter), callback);
},
reset: function(callback) {
- this.filter = {};
- this.init(this._data);
- callback && callback();
+ this.filter = {};
+ this.init(this._data);
+ callback && callback();
}
});
})();
diff --git a/openlibrary/plugins/openlibrary/js/template.js b/openlibrary/plugins/openlibrary/js/template.js
index 4a4462edeaa..9faf40aca83 100644
--- a/openlibrary/plugins/openlibrary/js/template.js
+++ b/openlibrary/plugins/openlibrary/js/template.js
@@ -2,51 +2,51 @@
//
// Inspired by http://ejohn.org/blog/javascript-micro-templating/
function Template(tmpl_text) {
- var s = [];
- var js = ["var _p=[];", "with(env) {"];
+ var s = [];
+ var js = ["var _p=[];", "with(env) {"];
- function addCode(text) {
- js.push(text);
- }
- function addExpr(text) {
- js.push("_p.push(htmlquote(" + text + "));");
- }
- function addText(text) {
- js.push("_p.push(__s[" + s.length + "]);");
- s.push(text);
- }
+ function addCode(text) {
+ js.push(text);
+ }
+ function addExpr(text) {
+ js.push("_p.push(htmlquote(" + text + "));");
+ }
+ function addText(text) {
+ js.push("_p.push(__s[" + s.length + "]);");
+ s.push(text);
+ }
- var tokens = tmpl_text.split("<%");
+ var tokens = tmpl_text.split("<%");
- addText(tokens[0]);
- for (var i=1; i < tokens.length; i++) {
- var t = tokens[i].split('%>');
+ addText(tokens[0]);
+ for (var i=1; i < tokens.length; i++) {
+ var t = tokens[i].split('%>');
- if (t[0][0] == "=") {
- addExpr(t[0].substr(1));
- }
- else {
- addCode(t[0]);
- }
- addText(t[1]);
+ if (t[0][0] == "=") {
+ addExpr(t[0].substr(1));
+ }
+ else {
+ addCode(t[0]);
}
- js.push("}", "return _p.join('');");
+ addText(t[1]);
+ }
+ js.push("}", "return _p.join('');");
- var f = new Function(["__s", "env"], js.join("\n"));
- var g = function(env) {
- return f(s, env);
- };
- g.toString = function() { return tmpl_text; };
- g.toCode = function() { return f.toString(); };
- return g;
+ var f = new Function(["__s", "env"], js.join("\n"));
+ var g = function(env) {
+ return f(s, env);
+ };
+ g.toString = function() { return tmpl_text; };
+ g.toCode = function() { return f.toString(); };
+ return g;
}
function htmlquote(text) {
- text = String(text);
- text = text.replace(/&/g, "&"); // Must be done first!
- text = text.replace(//g, ">");
- text = text.replace(/'/g, "'");
- text = text.replace(/"/g, """);
- return text;
+ text = String(text);
+ text = text.replace(/&/g, "&"); // Must be done first!
+ text = text.replace(//g, ">");
+ text = text.replace(/'/g, "'");
+ text = text.replace(/"/g, """);
+ return text;
}
diff --git a/openlibrary/plugins/openlibrary/js/utils.js b/openlibrary/plugins/openlibrary/js/utils.js
index 3bc6f10f935..4551b4ed086 100644
--- a/openlibrary/plugins/openlibrary/js/utils.js
+++ b/openlibrary/plugins/openlibrary/js/utils.js
@@ -1,123 +1,123 @@
-;(function($) {
+(function($) {
-// source: http://snipplr.com/view/8916/jquery-toggletext/
-$.fn.toggleText = function(a, b) {
+ // source: http://snipplr.com/view/8916/jquery-toggletext/
+ $.fn.toggleText = function(a, b) {
return this.each(function() {
- $(this).text($(this).text() == a ? b : a);
+ $(this).text($(this).text() == a ? b : a);
});
-};
+ };
-// http://jqueryminute.com/set-focus-to-the-next-input-field-with-jquery/
-$.fn.focusNextInputField = function() {
+ // http://jqueryminute.com/set-focus-to-the-next-input-field-with-jquery/
+ $.fn.focusNextInputField = function() {
return this.each(function() {
- var fields = $(this).parents('form:eq(0),body').find(':input:visible');
- var index = fields.index( this );
- if ( index > -1 && ( index + 1 ) < fields.length ) {
- fields.eq( index + 1 ).focus();
- }
- return false;
+ var fields = $(this).parents('form:eq(0),body').find(':input:visible');
+ var index = fields.index( this );
+ if ( index > -1 && ( index + 1 ) < fields.length ) {
+ fields.eq( index + 1 ).focus();
+ }
+ return false;
});
-};
+ };
-// Confirm dialog with OL styles.
-$.fn.ol_confirm_dialog = function(callback, options) {
+ // Confirm dialog with OL styles.
+ $.fn.ol_confirm_dialog = function(callback, options) {
var _this = this;
var defaults = {
- autoOpen: false,
- width: 400,
- modal: true,
- resizable: false,
- buttons: {
- "Yes, I'm sure": function() {
- callback.apply(_this);
- },
- "No, cancel": function() {
- $(_this).dialog("close");
- }
+ autoOpen: false,
+ width: 400,
+ modal: true,
+ resizable: false,
+ buttons: {
+ "Yes, I'm sure": function() {
+ callback.apply(_this);
+ },
+ "No, cancel": function() {
+ $(_this).dialog("close");
}
+ }
};
options = $.extend(defaults, options);
this.dialog(options);
-}
+ }
-// Tap into jquery chain
-$.fn.tap = function(callback) {
+ // Tap into jquery chain
+ $.fn.tap = function(callback) {
callback(this);
return this;
-}
+ }
-// debug log
-$.log = function() {
+ // debug log
+ $.log = function() {
if (window.console) {
- //console.log.apply(console, arguments);
+ //console.log.apply(console, arguments);
}
-};
+ };
})(jQuery);
// closes active popup
function closePopup() {
- parent.jQuery.fn.colorbox.close();
-};
+ parent.jQuery.fn.colorbox.close();
+}
function truncate(text, limit) {
- if (text.length > limit)
- return text.substr(0, limit) + "...";
- else
- return text;
+ if (text.length > limit)
+ return text.substr(0, limit) + "...";
+ else
+ return text;
}
function cond(predicate, true_value, false_value) {
- if (predicate) {
- return true_value;
- }
- else {
- return false_value;
- }
+ if (predicate) {
+ return true_value;
+ }
+ else {
+ return false_value;
+ }
}
// showPasswords implemented by Lance
(function($) {
- $.fn.extend({
- showPasswords: function(f) {
- return this.each(function() {
- var c = function(a) {
- var a = $(a);
- var b = $("
");
- b.insertAfter(a).attr({
- 'class': a.attr('class'),
- 'style': a.attr('style')
- });
- return b
- };
- var d = function($this, $that) {
- $that.val($this.val())
- };
- var e = function() {
- if ($checkbox.is(':checked')) {
- d($this, $clone);
- $clone.show();
- $this.hide()
- } else {
- d($clone, $this);
- $clone.hide();
- $this.show()
- }
- };
- var $clone = c(this),
- $this = $(this),
- $checkbox = $(f);
- $checkbox.click(function() {
- e()
- });
- $this.keyup(function() {
- d($this, $clone)
- });
- $clone.keyup(function() {
- d($clone, $this)
- });
- e()
- })
- }
- })
+ $.fn.extend({
+ showPasswords: function(f) {
+ return this.each(function() {
+ var c = function(a) {
+ var a = $(a);
+ var b = $("
");
+ b.insertAfter(a).attr({
+ 'class': a.attr('class'),
+ 'style': a.attr('style')
+ });
+ return b
+ };
+ var d = function($this, $that) {
+ $that.val($this.val())
+ };
+ var e = function() {
+ if ($checkbox.is(':checked')) {
+ d($this, $clone);
+ $clone.show();
+ $this.hide()
+ } else {
+ d($clone, $this);
+ $clone.hide();
+ $this.show()
+ }
+ };
+ var $clone = c(this),
+ $this = $(this),
+ $checkbox = $(f);
+ $checkbox.click(function() {
+ e()
+ });
+ $this.keyup(function() {
+ d($this, $clone)
+ });
+ $clone.keyup(function() {
+ d($clone, $this)
+ });
+ e()
+ })
+ }
+ })
})(jQuery);
diff --git a/openlibrary/plugins/openlibrary/js/validate.js b/openlibrary/plugins/openlibrary/js/validate.js
index ad02da8f074..5c8167bdac3 100644
--- a/openlibrary/plugins/openlibrary/js/validate.js
+++ b/openlibrary/plugins/openlibrary/js/validate.js
@@ -15,55 +15,55 @@
(function($) {
- // validate publish-date to make sure the date is not in future
- jQuery.validator.addMethod("publish-date", function(value, element) {
- // if it doesn't have even three digits then it can't be a future date
- var tokens = /(\d{3,})/.exec(value);
+ // validate publish-date to make sure the date is not in future
+ jQuery.validator.addMethod("publish-date", function(value, element) {
+ // if it doesn't have even three digits then it can't be a future date
+ var tokens = /(\d{3,})/.exec(value);
- var year = new Date().getFullYear();
- return tokens && tokens[1] && parseInt(tokens[1]) <= year + 1; // allow one year in future.
- },
- "Are you sure that's the published date?"
- );
+ var year = new Date().getFullYear();
+ return tokens && tokens[1] && parseInt(tokens[1]) <= year + 1; // allow one year in future.
+ },
+ "Are you sure that's the published date?"
+ );
- $.validator.messages.required = "";
- $.validator.messages.email = _("Are you sure that's an email address?");
+ $.validator.messages.required = "";
+ $.validator.messages.email = _("Are you sure that's an email address?");
- $.fn.ol_validate = function(options) {
- var defaults = {
- errorClass: "invalid",
- validClass: "success",
- errorElement: "span",
- invalidHandler: function(form, validator) {
- var errors = validator.numberOfInvalids();
- if (errors) {
- var message = ungettext(
- "Hang on... you missed a bit. It's highlighted below.",
- "Hang on...you missed some fields. They're highlighted below.",
- errors);
+ $.fn.ol_validate = function(options) {
+ var defaults = {
+ errorClass: "invalid",
+ validClass: "success",
+ errorElement: "span",
+ invalidHandler: function(form, validator) {
+ var errors = validator.numberOfInvalids();
+ if (errors) {
+ var message = ungettext(
+ "Hang on... you missed a bit. It's highlighted below.",
+ "Hang on...you missed some fields. They're highlighted below.",
+ errors);
- $("div#contentMsg span").html(message);
- $("div#contentMsg").show().fadeTo(3000, 1).slideUp();
- $("span.remind").css("font-weight", "700").css("text-decoration", "underline");
- } else {
- $("div#contentMsg").hide();
- }
- },
- highlight: function(element, errorClass) {
- $(element).addClass(errorClass);
- $(element.form)
- .find("label[for=" + element.id + "]")
- .addClass(errorClass);
- },
- unhighlight: function(element, errorClass) {
- $(element).removeClass(errorClass);
- $(element.form)
- .find("label[for=" + element.id + "]")
- .removeClass(errorClass);
- }
- };
- $(this).validate($.extend(defaults, options));
+ $("div#contentMsg span").html(message);
+ $("div#contentMsg").show().fadeTo(3000, 1).slideUp();
+ $("span.remind").css("font-weight", "700").css("text-decoration", "underline");
+ } else {
+ $("div#contentMsg").hide();
+ }
+ },
+ highlight: function(element, errorClass) {
+ $(element).addClass(errorClass);
+ $(element.form)
+ .find("label[for=" + element.id + "]")
+ .addClass(errorClass);
+ },
+ unhighlight: function(element, errorClass) {
+ $(element).removeClass(errorClass);
+ $(element.form)
+ .find("label[for=" + element.id + "]")
+ .removeClass(errorClass);
+ }
};
+ $(this).validate($.extend(defaults, options));
+ };
})(jQuery);