Commit f8365e9e authored by Neil Fraser's avatar Neil Fraser

Inject CSS rule for cursors regardless of CSS flag.

parent 6e45f933
This diff is collapsed.
...@@ -67,7 +67,11 @@ Blockly.Css.mediaPath_ = ''; ...@@ -67,7 +67,11 @@ Blockly.Css.mediaPath_ = '';
* c) The CSS content may be made dynamic depending on init options. * c) The CSS content may be made dynamic depending on init options.
*/ */
Blockly.Css.inject = function() { Blockly.Css.inject = function() {
var text = Blockly.Css.CONTENT.join('\n'); // Placeholder for cursor rule. Must be first rule (index 0).
var text = '.blocklyDraggable {}\n';
if (Blockly.hasCss) {
text += Blockly.Css.CONTENT.join('\n');
}
// Strip off any trailing slash (either Unix or Windows). // Strip off any trailing slash (either Unix or Windows).
Blockly.Css.mediaPath_ = Blockly.pathToMedia.replace(/[\\\/]$/, ''); Blockly.Css.mediaPath_ = Blockly.pathToMedia.replace(/[\\\/]$/, '');
text = text.replace(/<<<PATH>>>/g, Blockly.Css.mediaPath_); text = text.replace(/<<<PATH>>>/g, Blockly.Css.mediaPath_);
...@@ -124,10 +128,6 @@ Blockly.Css.setCursor = function(cursor) { ...@@ -124,10 +128,6 @@ Blockly.Css.setCursor = function(cursor) {
* Array making up the CSS content for Blockly. * Array making up the CSS content for Blockly.
*/ */
Blockly.Css.CONTENT = [ Blockly.Css.CONTENT = [
'.blocklyDraggable {',
// Placeholder for cursor rule. Must be first rule (index 0).
'}',
'.blocklySvg {', '.blocklySvg {',
' background-color: #fff;', ' background-color: #fff;',
' border: 1px solid #ddd;', ' border: 1px solid #ddd;',
......
...@@ -169,9 +169,7 @@ Blockly.createDom_ = function(container) { ...@@ -169,9 +169,7 @@ Blockly.createDom_ = function(container) {
goog.ui.Component.setDefaultRightToLeft(Blockly.RTL); goog.ui.Component.setDefaultRightToLeft(Blockly.RTL);
// Load CSS. // Load CSS.
if (Blockly.hasCss) {
Blockly.Css.inject(); Blockly.Css.inject();
}
// Build the SVG DOM. // Build the SVG DOM.
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment