X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=public%2Fassets%2Fsystem.js;h=23913d2ffd4b3a8f13183b2a16c7707bcf2df1a9;hb=2dc4a19e472009653fdeddd554debd0b744de8ef;hp=448f1e87627fd9cc177f7d86b65be3c8acebab21;hpb=490a4b439ac9bc67e4ed08f4b79dc809cc34cf97;p=pettanr%2Fpettanr.git diff --git a/public/assets/system.js b/public/assets/system.js index 448f1e87..23913d2f 100644 --- a/public/assets/system.js +++ b/public/assets/system.js @@ -1,6 +1,6 @@ /* * pettanR system.js - * version 0.4.27 + * version 0.4.29 * * author: * itozyun @@ -1778,7 +1778,7 @@ pettanr.premiumSatge = pettanr.view.registerApplication( function(){ elmButton.onclick = clickOK; - var BASE_PATH = pettanr.LOCAL === true ? 'resource_pictures\/' : pettanr.CONST.PETTANR_ROOT_PATH + 'resource_pictures\/', + var BASE_PATH = pettanr.LOCAL === true ? 'resource_pictures\/' : pettanr.CONST.RESOURCE_PICTURE_PATH, THUMB_PATH = BASE_PATH, // + 'thumbnail/', LIMIT_FILESIZE = 1024 * 10; // 10KB @@ -2015,11 +2015,12 @@ pettanr.textEditor = pettanr.view.registerApplication( function(){ function clickOK(){ textElement && textElement.text( jqTextarea.val() ); - onUpdateFunction ? window.setTimeout( asyncCallback, 50 ) : pettanr.textEditor.shutdown(); + window.setTimeout( asyncCallback, 0 ); } function asyncCallback(){ - onUpdateFunction( textElement ); + onUpdateFunction && onUpdateFunction( textElement ); + onUpdateFunction = textElement = null; pettanr.textEditor.shutdown(); } @@ -2082,7 +2083,6 @@ pettanr.textEditor = pettanr.view.registerApplication( function(){ } this.onClose = function(){ jqWrap.hide(); - textElement = onUpdateFunction = null; } });