More refactorings.

This commit is contained in:
Lars Jung 2014-06-08 22:26:03 +02:00
parent 9c414c92e2
commit 67bdb1515d
4 changed files with 33 additions and 37 deletions

View file

@ -12,7 +12,7 @@ modulejs.define('ext/custom', ['_', '$', 'core/settings', 'core/server', 'core/e
var has_header, has_footer, data, content;
if (response) {
resource.loadMarkdown(function (md) {
resource.ensureMarkdown(function (md) {
data = response.custom;

View file

@ -108,7 +108,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'co
$text = $(templateMarkdown).text(textContent);
resource.loadMarkdown(function (md) {
resource.ensureMarkdown(function (md) {
if (md) {
$text.html(md.toHTML(textContent));
@ -118,7 +118,7 @@ modulejs.define('ext/preview-txt', ['_', '$', 'core/settings', 'core/event', 'co
$text = $(templateText).text(textContent);
resource.loadSyntaxhighlighter(function (sh) {
resource.ensureSH(function (sh) {
if (sh) {
var $table = $('<table/>');

View file

@ -1,5 +1,5 @@
modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/event'], function (_, $, modernizr, allsettings, event) {
modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/event', 'core/resource'], function (_, $, modernizr, allsettings, event, resource) {
var settings = _.extend({
enabled: false,
@ -10,25 +10,9 @@ modulejs.define('ext/qrcode', ['_', '$', 'modernizr', 'core/settings', 'core/eve
$qrcode, hideTimeoutId,
loadQrCodeExtension = function (callback) {
if ($.fn.qrcode) {
callback();
} else {
$.ajax({
url: allsettings.appHref + 'client/js/qrcode.js',
dataType: 'script',
complete: function () {
callback();
}
});
}
},
update = function (item) {
loadQrCodeExtension(function () {
resource.ensureQRCode(function () {
$qrcode.empty().qrcode({
render: modernizr.canvas ? 'canvas' : 'div',
width: settings.size,