diff --git a/public/js/render/live.js b/public/js/render/live.js index 01ab80d2..9afba92d 100644 --- a/public/js/render/live.js +++ b/public/js/render/live.js @@ -298,9 +298,7 @@ var renderLivePreview = (function () { // No postMessage? Don't render – the event-stream will handle it. if (!window.postMessage) return; - var sourceData = getPreparedCode(), - source = sourceData.source, - scriptOffset = sourceData.scriptOffset, + var source = getPreparedCode(), includeJsInRealtime = jsbin.settings.includejs; // Inform other pages event streaming render to reload if (requested) sendReload(); @@ -309,7 +307,6 @@ var renderLivePreview = (function () { renderer.postMessage('render', { source: source, options: { - scriptOffset: scriptOffset, requested: requested, debug: jsbin.settings.debug, includeJsInRealtime: jsbin.settings.includejs diff --git a/public/js/render/render.js b/public/js/render/render.js index 77b15598..902392f6 100644 --- a/public/js/render/render.js +++ b/public/js/render/render.js @@ -7,6 +7,7 @@ var getPreparedCode = (function () { console: /(^.|\b)console\.(\S+)/g, script: /<\/script/ig, code: /%code%/, + csscode: /%css%/, title: /
\n" + css + ""; + } else if (re.csscode.test(source)) { + parts = source.split('%css%'); + source = parts[0] + css + parts[1]; } else if (css && hasHTML) { parts = []; close = ''; @@ -137,7 +139,6 @@ var getPreparedCode = (function () { close = parts.length == 2 && parts[1] ? parts[1] : ''; } source += '\n' + close; - scriptOffset += (2 + css.split('\n').length); } // specific change for rendering $(document).ready() because iframes doesn't trigger ready (TODO - really test in IE, may have been fixed...) @@ -168,7 +169,7 @@ var getPreparedCode = (function () { document.title = documentTitle + ' - ' + 'JS Bin'; } - return { source: source, scriptOffset: scriptOffset }; + return source; } }());