diff --git a/public_html/js/Main_test.js b/public_html/js/Main_test.js new file mode 100644 index 0000000..ca36095 --- /dev/null +++ b/public_html/js/Main_test.js @@ -0,0 +1,31 @@ +/* global rpyscript, TextUtils */ + +var ViewActivity = null; + +function run(data) { + var tokens = new Lexer(data).process().getTokens(); + var parser = new Parser(tokens); + ViewActivity = new Views(parser); + parser.next(); + + document.addEventListener('click', function (e) { + ViewActivity.getInstance().onTouch(e); + }); +} + +$(document).ready(function() { + if ( (typeof rpyscript === 'undefined') || TextUtils.isEmpty(rpyscript)) { + run('play music music_list["everlasting_summer"]\n' + + 'scene bg ext_square_day\n' + + 'show mz smile pioneer far at fright\n' + + 'show us grin sport far at fleft\n' + + 'show mt smile pioneer far at right\n' + + 'show mi smile pioneer far at left\n' + + 'show dv smile pioneer2 at cright\n' + + 'show sl smile pioneer at cleft\n' + + 'show un smile2 pioneer at center\n' + + 'all "Приглашаем тебя в Бесконечное Лето!"'); + } else { + $.get("/resources/es/scripts/" + rpyscript + ".rpy", run); + } +}); diff --git a/public_html/js/Views.js b/public_html/js/Views.js index b545a5f..2c10ceb 100644 --- a/public_html/js/Views.js +++ b/public_html/js/Views.js @@ -149,18 +149,22 @@ Views.prototype.sprite = function (whoid, params, position, alias, effect) { try { //if (useSpriteTransitions) ((AnimatableImageView)img).setImageBitmap(bitmap, effect); //else img.setImageBitmap(bitmap); + img.hide(); img.one("load", function() { ViewActivity.getInstance().setSpritePosition($(this), position); + if (effect in transitions) { + var transition = transitions[effect]; + if (transition["type"] === Transition.TYPE_FADE) { + $(this).hide().fadeIn(transition["inTime"]); + return; + } + } + $(this).show(); }); img.attr('src', path); if (!$.contains($('#container'), img)) $('#container').append(img); - if (effect in transitions) { - var transition = transitions[effect]; - if (transition["type"] === Transition.TYPE_FADE) { - img.hide().fadeIn(transition["inTime"]); - } - } + } catch (ioe) { console.log("sprite: " + path, ioe); //if (Logger.DEBUG) Logger.log("sprite: " + path, ioe);