diff --git a/core/renderers/sample/constants.js b/core/renderers/minimalist/constants.js similarity index 80% rename from core/renderers/sample/constants.js rename to core/renderers/minimalist/constants.js index f2909fe1c..a65a560f4 100644 --- a/core/renderers/sample/constants.js +++ b/core/renderers/minimalist/constants.js @@ -20,11 +20,11 @@ /** * @fileoverview An object that provides constants for rendering blocks in the - * sample renderer. + * minimalist renderer. */ 'use strict'; -goog.provide('Blockly.sample.ConstantProvider'); +goog.provide('Blockly.minimalist.ConstantProvider'); goog.require('Blockly.blockRendering.ConstantProvider'); goog.require('Blockly.utils.object'); @@ -36,8 +36,8 @@ goog.require('Blockly.utils.object'); * @package * @extends {Blockly.blockRendering.ConstantProvider} */ -Blockly.sample.ConstantProvider = function() { - Blockly.sample.ConstantProvider.superClass_.constructor.call(this); +Blockly.minimalist.ConstantProvider = function() { + Blockly.minimalist.ConstantProvider.superClass_.constructor.call(this); }; -Blockly.utils.object.inherits(Blockly.sample.ConstantProvider, +Blockly.utils.object.inherits(Blockly.minimalist.ConstantProvider, Blockly.blockRendering.ConstantProvider); diff --git a/core/renderers/sample/drawer.js b/core/renderers/minimalist/drawer.js similarity index 73% rename from core/renderers/sample/drawer.js rename to core/renderers/minimalist/drawer.js index 032d853e2..565ebf756 100644 --- a/core/renderers/sample/drawer.js +++ b/core/renderers/minimalist/drawer.js @@ -19,29 +19,29 @@ */ /** - * @fileoverview Sample rendering drawer. + * @fileoverview Minimalist rendering drawer. */ 'use strict'; -goog.provide('Blockly.sample.Drawer'); +goog.provide('Blockly.minimalist.Drawer'); goog.require('Blockly.blockRendering.Drawer'); goog.require('Blockly.utils.object'); -goog.require('Blockly.sample.RenderInfo'); +goog.require('Blockly.minimalist.RenderInfo'); /** * An object that draws a block based on the given rendering information. * @param {!Blockly.BlockSvg} block The block to render. - * @param {!Blockly.sample.RenderInfo} info An object containing all + * @param {!Blockly.minimalist.RenderInfo} info An object containing all * information needed to render this block. * @package * @constructor * @extends {Blockly.blockRendering.Drawer} */ -Blockly.sample.Drawer = function(block, info) { - Blockly.sample.Drawer.superClass_.constructor.call(this, block, info); +Blockly.minimalist.Drawer = function(block, info) { + Blockly.minimalist.Drawer.superClass_.constructor.call(this, block, info); }; -Blockly.utils.object.inherits(Blockly.sample.Drawer, +Blockly.utils.object.inherits(Blockly.minimalist.Drawer, Blockly.blockRendering.Drawer); diff --git a/core/renderers/sample/info.js b/core/renderers/minimalist/info.js similarity index 66% rename from core/renderers/sample/info.js rename to core/renderers/minimalist/info.js index 3a2ca81a6..2a5137f67 100644 --- a/core/renderers/sample/info.js +++ b/core/renderers/minimalist/info.js @@ -19,12 +19,12 @@ */ /** - * @fileoverview Sample render info object. + * @fileoverview Minimalist render info object. */ 'use strict'; -goog.provide('Blockly.sample'); -goog.provide('Blockly.sample.RenderInfo'); +goog.provide('Blockly.minimalist'); +goog.provide('Blockly.minimalist.RenderInfo'); goog.require('Blockly.utils.object'); @@ -36,24 +36,24 @@ goog.require('Blockly.utils.object'); * may choose to rerender when getSize() is called). However, calling it * repeatedly may be expensive. * - * @param {!Blockly.sample.Renderer} renderer The renderer in use. + * @param {!Blockly.minimalist.Renderer} renderer The renderer in use. * @param {!Blockly.BlockSvg} block The block to measure. * @constructor * @package * @extends {Blockly.blockRendering.RenderInfo} */ -Blockly.sample.RenderInfo = function(renderer, block) { - Blockly.sample.RenderInfo.superClass_.constructor.call(this, renderer, block); +Blockly.minimalist.RenderInfo = function(renderer, block) { + Blockly.minimalist.RenderInfo.superClass_.constructor.call(this, renderer, block); }; -Blockly.utils.object.inherits(Blockly.sample.RenderInfo, +Blockly.utils.object.inherits(Blockly.minimalist.RenderInfo, Blockly.blockRendering.RenderInfo); /** * Get the block renderer in use. - * @return {!Blockly.sample.Renderer} The block renderer in use. + * @return {!Blockly.minimalist.Renderer} The block renderer in use. * @package */ -Blockly.sample.RenderInfo.prototype.getRenderer = function() { - return /** @type {!Blockly.sample.Renderer} */ (this.renderer_); +Blockly.minimalist.RenderInfo.prototype.getRenderer = function() { + return /** @type {!Blockly.minimalist.Renderer} */ (this.renderer_); }; diff --git a/core/renderers/sample/renderer.js b/core/renderers/minimalist/renderer.js similarity index 56% rename from core/renderers/sample/renderer.js rename to core/renderers/minimalist/renderer.js index 94ffba38e..a22a15d0b 100644 --- a/core/renderers/sample/renderer.js +++ b/core/renderers/minimalist/renderer.js @@ -19,51 +19,51 @@ */ /** - * @fileoverview Sample renderer. + * @fileoverview Minimalist renderer. */ 'use strict'; -goog.provide('Blockly.sample.Renderer'); +goog.provide('Blockly.minimalist.Renderer'); goog.require('Blockly.blockRendering'); goog.require('Blockly.blockRendering.Renderer'); goog.require('Blockly.utils.object'); -goog.require('Blockly.sample.ConstantProvider'); -goog.require('Blockly.sample.Drawer'); -goog.require('Blockly.sample.RenderInfo'); +goog.require('Blockly.minimalist.ConstantProvider'); +goog.require('Blockly.minimalist.Drawer'); +goog.require('Blockly.minimalist.RenderInfo'); /** - * The sample renderer. + * The minimalist renderer. * @package * @constructor * @extends {Blockly.blockRendering.Renderer} */ -Blockly.sample.Renderer = function() { - Blockly.sample.Renderer.superClass_.constructor.call(this); +Blockly.minimalist.Renderer = function() { + Blockly.minimalist.Renderer.superClass_.constructor.call(this); }; -Blockly.utils.object.inherits(Blockly.sample.Renderer, +Blockly.utils.object.inherits(Blockly.minimalist.Renderer, Blockly.blockRendering.Renderer); /** * Create a new instance of the renderer's constant provider. - * @return {!Blockly.sample.ConstantProvider} The constant provider. + * @return {!Blockly.minimalist.ConstantProvider} The constant provider. * @protected * @override */ -Blockly.sample.Renderer.prototype.makeConstants_ = function() { - return new Blockly.sample.ConstantProvider(); +Blockly.minimalist.Renderer.prototype.makeConstants_ = function() { + return new Blockly.minimalist.ConstantProvider(); }; /** * Create a new instance of the renderer's render info object. * @param {!Blockly.BlockSvg} block The block to measure. - * @return {!Blockly.sample.RenderInfo} The render info object. + * @return {!Blockly.minimalist.RenderInfo} The render info object. * @protected * @override */ -Blockly.sample.Renderer.prototype.makeRenderInfo_ = function(block) { - return new Blockly.sample.RenderInfo(this, block); +Blockly.minimalist.Renderer.prototype.makeRenderInfo_ = function(block) { + return new Blockly.minimalist.RenderInfo(this, block); }; /** @@ -71,13 +71,13 @@ Blockly.sample.Renderer.prototype.makeRenderInfo_ = function(block) { * @param {!Blockly.BlockSvg} block The block to render. * @param {!Blockly.blockRendering.RenderInfo} info An object containing all * information needed to render this block. - * @return {!Blockly.sample.Drawer} The drawer. + * @return {!Blockly.minimalist.Drawer} The drawer. * @protected * @override */ -Blockly.sample.Renderer.prototype.makeDrawer_ = function(block, info) { - return new Blockly.sample.Drawer(block, - /** @type {!Blockly.sample.RenderInfo} */ (info)); +Blockly.minimalist.Renderer.prototype.makeDrawer_ = function(block, info) { + return new Blockly.minimalist.Drawer(block, + /** @type {!Blockly.minimalist.RenderInfo} */ (info)); }; -Blockly.blockRendering.register('sample', Blockly.sample.Renderer); +Blockly.blockRendering.register('minimalist', Blockly.minimalist.Renderer); diff --git a/tests/playground.html b/tests/playground.html index 8c70d6c0a..f927eb8e0 100644 --- a/tests/playground.html +++ b/tests/playground.html @@ -69,7 +69,7 @@ @@ -567,7 +567,7 @@ var spaghettiXml = [ - +