diff --git a/src/generators/dom/visitors/Element/StyleAttribute.ts b/src/generators/dom/visitors/Element/StyleAttribute.ts
index da833ba8f4..2ca0618eb2 100644
--- a/src/generators/dom/visitors/Element/StyleAttribute.ts
+++ b/src/generators/dom/visitors/Element/StyleAttribute.ts
@@ -118,51 +118,62 @@ function getStyleValue(chunks: Node[]) {
const value: Node[] = [];
let inUrl = false;
+ let quoteMark = null;
+ let escaped = false;
while (chunks.length) {
- const chunk = chunks[0];
+ const chunk = chunks.shift();
if (chunk.type === 'Text') {
- // TODO annoying special case — urls can contain semicolons
-
- let index = chunk.data.indexOf(';');
+ let c = 0;
+ while (c < chunk.data.length) {
+ const char = chunk.data[c];
+
+ if (escaped) {
+ escaped = false;
+ } else if (char === '\\') {
+ escaped = true;
+ } else if (char === quoteMark) {
+ quoteMark === null;
+ } else if (char === '"' || char === "'") {
+ quoteMark = char;
+ } else if (char === ')' && inUrl) {
+ inUrl = false;
+ } else if (char === 'u' && chunk.data.slice(c, c + 4) === 'url(') {
+ inUrl = true;
+ } else if (char === ';' && !inUrl && !quoteMark) {
+ break;
+ }
- if (index === -1) {
- value.push(chunk);
- chunks.shift();
+ c += 1;
}
- else {
- if (index > 0) {
- value.push({
- type: 'Text',
- start: chunk.start,
- end: chunk.start + index,
- data: chunk.data.slice(0, index)
- });
- }
-
- while (/[;\s]/.test(chunk.data[index])) index += 1;
+ if (c > 0) {
+ value.push({
+ type: 'Text',
+ start: chunk.start,
+ end: chunk.start + c,
+ data: chunk.data.slice(0, c)
+ });
+ }
- const remainingData = chunk.data.slice(index);
+ while (/[;\s]/.test(chunk.data[c])) c += 1;
+ const remainingData = chunk.data.slice(c);
- if (remainingData) {
- chunks[0] = {
- start: chunk.start + index,
- end: chunk.end,
- type: 'Text',
- data: remainingData
- };
- } else {
- chunks.shift();
- }
+ if (remainingData) {
+ chunks.unshift({
+ start: chunk.start + c,
+ end: chunk.end,
+ type: 'Text',
+ data: remainingData
+ });
break;
}
}
else {
- value.push(chunks.shift());
+ value.push(chunk);
}
}
diff --git a/test/js/samples/inline-style-optimized-url/expected-bundle.js b/test/js/samples/inline-style-optimized-url/expected-bundle.js
new file mode 100644
index 0000000000..45eb18fb0a
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/expected-bundle.js
@@ -0,0 +1,212 @@
+function noop() {}
+
+function assign(target) {
+ var k,
+ source,
+ i = 1,
+ len = arguments.length;
+ for (; i < len; i++) {
+ source = arguments[i];
+ for (k in source) target[k] = source[k];
+ }
+
+ return target;
+}
+
+function insertNode(node, target, anchor) {
+ target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+ node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+ return document.createElement(name);
+}
+
+function destroy(detach) {
+ this.destroy = noop;
+ this.fire('destroy');
+ this.set = this.get = noop;
+
+ if (detach !== false) this._fragment.unmount();
+ this._fragment.destroy();
+ this._fragment = this._state = null;
+}
+
+function differs(a, b) {
+ return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+ for (var key in group) {
+ if (!changed[key]) continue;
+
+ var newValue = newState[key];
+ var oldValue = oldState[key];
+
+ var callbacks = group[key];
+ if (!callbacks) continue;
+
+ for (var i = 0; i < callbacks.length; i += 1) {
+ var callback = callbacks[i];
+ if (callback.__calling) continue;
+
+ callback.__calling = true;
+ callback.call(component, newValue, oldValue);
+ callback.__calling = false;
+ }
+ }
+}
+
+function get(key) {
+ return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+ var handlers =
+ eventName in this._handlers && this._handlers[eventName].slice();
+ if (!handlers) return;
+
+ for (var i = 0; i < handlers.length; i += 1) {
+ handlers[i].call(this, data);
+ }
+}
+
+function observe(key, callback, options) {
+ var group = options && options.defer
+ ? this._observers.post
+ : this._observers.pre;
+
+ (group[key] || (group[key] = [])).push(callback);
+
+ if (!options || options.init !== false) {
+ callback.__calling = true;
+ callback.call(this, this._state[key]);
+ callback.__calling = false;
+ }
+
+ return {
+ cancel: function() {
+ var index = group[key].indexOf(callback);
+ if (~index) group[key].splice(index, 1);
+ }
+ };
+}
+
+function on(eventName, handler) {
+ if (eventName === 'teardown') return this.on('destroy', handler);
+
+ var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+ handlers.push(handler);
+
+ return {
+ cancel: function() {
+ var index = handlers.indexOf(handler);
+ if (~index) handlers.splice(index, 1);
+ }
+ };
+}
+
+function set(newState) {
+ this._set(assign({}, newState));
+ if (this._root._lock) return;
+ this._root._lock = true;
+ callAll(this._root._beforecreate);
+ callAll(this._root._oncreate);
+ callAll(this._root._aftercreate);
+ this._root._lock = false;
+}
+
+function _set(newState) {
+ var oldState = this._state,
+ changed = {},
+ dirty = false;
+
+ for (var key in newState) {
+ if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
+ }
+ if (!dirty) return;
+
+ this._state = assign({}, oldState, newState);
+ this._recompute(changed, this._state, oldState, false);
+ if (this._bind) this._bind(changed, this._state);
+ dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+ this._fragment.update(changed, this._state);
+ dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+}
+
+function callAll(fns) {
+ while (fns && fns.length) fns.pop()();
+}
+
+var proto = {
+ destroy: destroy,
+ get: get,
+ fire: fire,
+ observe: observe,
+ on: on,
+ set: set,
+ teardown: destroy,
+ _recompute: noop,
+ _set: _set
+};
+
+function create_main_fragment ( state, component ) {
+ var div;
+
+ return {
+ create: function () {
+ div = createElement( 'div' );
+ this.hydrate();
+ },
+
+ hydrate: function ( nodes ) {
+ div.style.setProperty('background', "url(data:image/png;base64," + state.data + ")");
+ },
+
+ mount: function ( target, anchor ) {
+ insertNode( div, target, anchor );
+ },
+
+ update: function ( changed, state ) {
+ if ( changed.data ) {
+ div.style.setProperty('background', "url(data:image/png;base64," + state.data + ")");
+ }
+ },
+
+ unmount: function () {
+ detachNode( div );
+ },
+
+ destroy: noop
+ };
+}
+
+function SvelteComponent ( options ) {
+ this.options = options;
+ this._state = options.data || {};
+
+ this._observers = {
+ pre: Object.create( null ),
+ post: Object.create( null )
+ };
+
+ this._handlers = Object.create( null );
+
+ this._root = options._root || this;
+ this._yield = options._yield;
+ this._bind = options._bind;
+
+ this._fragment = create_main_fragment( this._state, this );
+
+ if ( options.target ) {
+ this._fragment.create();
+ this._fragment.mount( options.target, options.anchor || null );
+ }
+}
+
+assign( SvelteComponent.prototype, proto );
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-optimized-url/expected.js b/test/js/samples/inline-style-optimized-url/expected.js
new file mode 100644
index 0000000000..bd5439dbf6
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/expected.js
@@ -0,0 +1,59 @@
+import { assign, createElement, detachNode, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment ( state, component ) {
+ var div;
+
+ return {
+ create: function () {
+ div = createElement( 'div' );
+ this.hydrate();
+ },
+
+ hydrate: function ( nodes ) {
+ div.style.setProperty('background', "url(data:image/png;base64," + state.data + ")");
+ },
+
+ mount: function ( target, anchor ) {
+ insertNode( div, target, anchor );
+ },
+
+ update: function ( changed, state ) {
+ if ( changed.data ) {
+ div.style.setProperty('background', "url(data:image/png;base64," + state.data + ")");
+ }
+ },
+
+ unmount: function () {
+ detachNode( div );
+ },
+
+ destroy: noop
+ };
+}
+
+function SvelteComponent ( options ) {
+ this.options = options;
+ this._state = options.data || {};
+
+ this._observers = {
+ pre: Object.create( null ),
+ post: Object.create( null )
+ };
+
+ this._handlers = Object.create( null );
+
+ this._root = options._root || this;
+ this._yield = options._yield;
+ this._bind = options._bind;
+
+ this._fragment = create_main_fragment( this._state, this );
+
+ if ( options.target ) {
+ this._fragment.create();
+ this._fragment.mount( options.target, options.anchor || null );
+ }
+}
+
+assign( SvelteComponent.prototype, proto );
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-optimized-url/input.html b/test/js/samples/inline-style-optimized-url/input.html
new file mode 100644
index 0000000000..7e3b2928eb
--- /dev/null
+++ b/test/js/samples/inline-style-optimized-url/input.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/expected-bundle.js b/test/js/samples/inline-style-unoptimized/expected-bundle.js
new file mode 100644
index 0000000000..f463764157
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/expected-bundle.js
@@ -0,0 +1,227 @@
+function noop() {}
+
+function assign(target) {
+ var k,
+ source,
+ i = 1,
+ len = arguments.length;
+ for (; i < len; i++) {
+ source = arguments[i];
+ for (k in source) target[k] = source[k];
+ }
+
+ return target;
+}
+
+function insertNode(node, target, anchor) {
+ target.insertBefore(node, anchor);
+}
+
+function detachNode(node) {
+ node.parentNode.removeChild(node);
+}
+
+function createElement(name) {
+ return document.createElement(name);
+}
+
+function createText(data) {
+ return document.createTextNode(data);
+}
+
+function destroy(detach) {
+ this.destroy = noop;
+ this.fire('destroy');
+ this.set = this.get = noop;
+
+ if (detach !== false) this._fragment.unmount();
+ this._fragment.destroy();
+ this._fragment = this._state = null;
+}
+
+function differs(a, b) {
+ return a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+}
+
+function dispatchObservers(component, group, changed, newState, oldState) {
+ for (var key in group) {
+ if (!changed[key]) continue;
+
+ var newValue = newState[key];
+ var oldValue = oldState[key];
+
+ var callbacks = group[key];
+ if (!callbacks) continue;
+
+ for (var i = 0; i < callbacks.length; i += 1) {
+ var callback = callbacks[i];
+ if (callback.__calling) continue;
+
+ callback.__calling = true;
+ callback.call(component, newValue, oldValue);
+ callback.__calling = false;
+ }
+ }
+}
+
+function get(key) {
+ return key ? this._state[key] : this._state;
+}
+
+function fire(eventName, data) {
+ var handlers =
+ eventName in this._handlers && this._handlers[eventName].slice();
+ if (!handlers) return;
+
+ for (var i = 0; i < handlers.length; i += 1) {
+ handlers[i].call(this, data);
+ }
+}
+
+function observe(key, callback, options) {
+ var group = options && options.defer
+ ? this._observers.post
+ : this._observers.pre;
+
+ (group[key] || (group[key] = [])).push(callback);
+
+ if (!options || options.init !== false) {
+ callback.__calling = true;
+ callback.call(this, this._state[key]);
+ callback.__calling = false;
+ }
+
+ return {
+ cancel: function() {
+ var index = group[key].indexOf(callback);
+ if (~index) group[key].splice(index, 1);
+ }
+ };
+}
+
+function on(eventName, handler) {
+ if (eventName === 'teardown') return this.on('destroy', handler);
+
+ var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+ handlers.push(handler);
+
+ return {
+ cancel: function() {
+ var index = handlers.indexOf(handler);
+ if (~index) handlers.splice(index, 1);
+ }
+ };
+}
+
+function set(newState) {
+ this._set(assign({}, newState));
+ if (this._root._lock) return;
+ this._root._lock = true;
+ callAll(this._root._beforecreate);
+ callAll(this._root._oncreate);
+ callAll(this._root._aftercreate);
+ this._root._lock = false;
+}
+
+function _set(newState) {
+ var oldState = this._state,
+ changed = {},
+ dirty = false;
+
+ for (var key in newState) {
+ if (differs(newState[key], oldState[key])) changed[key] = dirty = true;
+ }
+ if (!dirty) return;
+
+ this._state = assign({}, oldState, newState);
+ this._recompute(changed, this._state, oldState, false);
+ if (this._bind) this._bind(changed, this._state);
+ dispatchObservers(this, this._observers.pre, changed, this._state, oldState);
+ this._fragment.update(changed, this._state);
+ dispatchObservers(this, this._observers.post, changed, this._state, oldState);
+}
+
+function callAll(fns) {
+ while (fns && fns.length) fns.pop()();
+}
+
+var proto = {
+ destroy: destroy,
+ get: get,
+ fire: fire,
+ observe: observe,
+ on: on,
+ set: set,
+ teardown: destroy,
+ _recompute: noop,
+ _set: _set
+};
+
+function create_main_fragment ( state, component ) {
+ var div, text, div_1, div_1_style_value;
+
+ return {
+ create: function () {
+ div = createElement( 'div' );
+ text = createText( "\n" );
+ div_1 = createElement( 'div' );
+ this.hydrate();
+ },
+
+ hydrate: function ( nodes ) {
+ div.style.cssText = state.style;
+ div_1.style.cssText = div_1_style_value = "" + ( state.key ) + ": " + ( state.value );
+ },
+
+ mount: function ( target, anchor ) {
+ insertNode( div, target, anchor );
+ insertNode( text, target, anchor );
+ insertNode( div_1, target, anchor );
+ },
+
+ update: function ( changed, state ) {
+ if ( changed.style ) {
+ div.style.cssText = state.style;
+ }
+
+ if ( ( changed.key || changed.value ) && div_1_style_value !== ( div_1_style_value = "" + ( state.key ) + ": " + ( state.value ) ) ) {
+ div_1.style.cssText = div_1_style_value;
+ }
+ },
+
+ unmount: function () {
+ detachNode( div );
+ detachNode( text );
+ detachNode( div_1 );
+ },
+
+ destroy: noop
+ };
+}
+
+function SvelteComponent ( options ) {
+ this.options = options;
+ this._state = options.data || {};
+
+ this._observers = {
+ pre: Object.create( null ),
+ post: Object.create( null )
+ };
+
+ this._handlers = Object.create( null );
+
+ this._root = options._root || this;
+ this._yield = options._yield;
+ this._bind = options._bind;
+
+ this._fragment = create_main_fragment( this._state, this );
+
+ if ( options.target ) {
+ this._fragment.create();
+ this._fragment.mount( options.target, options.anchor || null );
+ }
+}
+
+assign( SvelteComponent.prototype, proto );
+
+export default SvelteComponent;
diff --git a/test/js/samples/inline-style-unoptimized/expected.js b/test/js/samples/inline-style-unoptimized/expected.js
new file mode 100644
index 0000000000..74f9ddca2a
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/expected.js
@@ -0,0 +1,70 @@
+import { assign, createElement, createText, detachNode, insertNode, noop, proto } from "svelte/shared.js";
+
+function create_main_fragment ( state, component ) {
+ var div, text, div_1, div_1_style_value;
+
+ return {
+ create: function () {
+ div = createElement( 'div' );
+ text = createText( "\n" );
+ div_1 = createElement( 'div' );
+ this.hydrate();
+ },
+
+ hydrate: function ( nodes ) {
+ div.style.cssText = state.style;
+ div_1.style.cssText = div_1_style_value = "" + ( state.key ) + ": " + ( state.value );
+ },
+
+ mount: function ( target, anchor ) {
+ insertNode( div, target, anchor );
+ insertNode( text, target, anchor );
+ insertNode( div_1, target, anchor );
+ },
+
+ update: function ( changed, state ) {
+ if ( changed.style ) {
+ div.style.cssText = state.style;
+ }
+
+ if ( ( changed.key || changed.value ) && div_1_style_value !== ( div_1_style_value = "" + ( state.key ) + ": " + ( state.value ) ) ) {
+ div_1.style.cssText = div_1_style_value;
+ }
+ },
+
+ unmount: function () {
+ detachNode( div );
+ detachNode( text );
+ detachNode( div_1 );
+ },
+
+ destroy: noop
+ };
+}
+
+function SvelteComponent ( options ) {
+ this.options = options;
+ this._state = options.data || {};
+
+ this._observers = {
+ pre: Object.create( null ),
+ post: Object.create( null )
+ };
+
+ this._handlers = Object.create( null );
+
+ this._root = options._root || this;
+ this._yield = options._yield;
+ this._bind = options._bind;
+
+ this._fragment = create_main_fragment( this._state, this );
+
+ if ( options.target ) {
+ this._fragment.create();
+ this._fragment.mount( options.target, options.anchor || null );
+ }
+}
+
+assign( SvelteComponent.prototype, proto );
+
+export default SvelteComponent;
\ No newline at end of file
diff --git a/test/js/samples/inline-style-unoptimized/input.html b/test/js/samples/inline-style-unoptimized/input.html
new file mode 100644
index 0000000000..87e4592bfd
--- /dev/null
+++ b/test/js/samples/inline-style-unoptimized/input.html
@@ -0,0 +1,2 @@
+
+
\ No newline at end of file