Removed deprecated editor flags.

The editor flags were only used in an alpha version and are not used since then. Which mean they could be safetly removed from all integrations.

Author: MarkusBordihn

src/file_format/file_format.js

@@ -24,7 +24,6 @@ goog.provide('cwc.fileFormat.File');
 goog.require('cwc.file.Files');
 goog.require('cwc.file.MimeType');
 goog.require('cwc.mode.Type');
-goog.require('cwc.ui.EditorFlags');
 goog.require('cwc.utils.Logger');
 
 
@@ -107,7 +106,6 @@ cwc.fileFormat.File.prototype.init = function(silent = false) {
   this.frameworks_ = new cwc.file.Files();
   this.history_ = '';
   this.mode_ = cwc.mode.Type.NONE;
-  this.setFlag('__editor__', new cwc.ui.EditorFlags());
   this.ui_ = 'default';
   this.metadata_ = {};
 };
@@ -199,22 +197,6 @@ cwc.fileFormat.File.prototype.getDescription = function() {
 };
 
 
-/**
- * @return {cwc.ui.EditorFlags}
- */
-cwc.fileFormat.File.prototype.getEditorFlags = function() {
-  return /** @type {cwc.ui.EditorFlags} */ (this.getFlag('__editor__'));
-};
-
-
-/**
- * @param {cwc.ui.EditorFlags} flags
- */
-cwc.fileFormat.File.prototype.setEditorFlags = function(flags) {
-  this.setFlag('__editor__', flags);
-};
-
-
 /**
  * @param {string} name
  * @param {string=} group
@@ -261,7 +243,7 @@ cwc.fileFormat.File.prototype.hasFiles = function() {
 
 /**
  * @param {!string} name
- * @return {Object.<string>|string|cwc.ui.EditorFlags}
+ * @return {Object.<string>|string}
  */
 cwc.fileFormat.File.prototype.getFlag = function(name) {
   return this.flags_[name] || '';
@@ -278,7 +260,7 @@ cwc.fileFormat.File.prototype.getFlags = function() {
 
 /**
  * @param {!string} name
- * @param {Object.<string>|string|cwc.ui.EditorFlags} value
+ * @param {Object.<string>|string} value
  */
 cwc.fileFormat.File.prototype.setFlag = function(name, value) {
   this.flags_[name] = value;

src/file_handler/file_handler.js

@@ -82,7 +82,6 @@ cwc.fileHandler.File.prototype.clear = function(silent = false) {
  * @param {!cwc.fileFormat.File} file
  */
 cwc.fileHandler.File.prototype.setFile = function(file) {
-  console.log('Set instance file to:', file);
   this.clear(true);
   this.file_ = file;
 };
@@ -130,7 +129,6 @@ cwc.fileHandler.File.prototype.getMimeType = function() {
  * @param {!cwc.file.MimeType} mimeType
  */
 cwc.fileHandler.File.prototype.setMimeType = function(mimeType) {
-  console.log('setMimeType:', mimeType);
   this.mimeType_ = mimeType;
 };
 
@@ -229,7 +227,7 @@ cwc.fileHandler.File.prototype.getUi = function() {
 
 /**
  * @param {!string} name
- * @param {Object.<string>|string|cwc.ui.EditorFlags} value
+ * @param {Object.<string>|string} value
  */
 cwc.fileHandler.File.prototype.setFlag = function(name, value) {
   this.file_.setFlag(name, value);
@@ -238,29 +236,13 @@ cwc.fileHandler.File.prototype.setFlag = function(name, value) {
 
 /**
  * @param {!string} name
- * @return {Object.<string>|string|cwc.ui.EditorFlags}
+ * @return {Object.<string>|string}
  */
 cwc.fileHandler.File.prototype.getFlag = function(name) {
   return this.file_.getFlag(name);
 };
 
 
-/**
- * @return {cwc.ui.EditorFlags}
- */
-cwc.fileHandler.File.prototype.getEditorFlags = function() {
-  return this.file_.getEditorFlags();
-};
-
-
-/**
- * @param {cwc.ui.EditorFlags} flags
- */
-cwc.fileHandler.File.prototype.setEditorFlags = function(flags) {
-  this.file_.setEditorFlags(flags);
-};
-
-
 /**
  * @param {string} title
  */

src/mode/modder.js

@@ -181,13 +181,11 @@ cwc.mode.Modder.prototype.addBlocklyView = function(name, content) {
  * @param {string=} content
  * @param {cwc.ui.EditorType=} type
  * @param {cwc.ui.EditorHint=} hints
- * @param {cwc.ui.EditorFlags=} flags
  */
-cwc.mode.Modder.prototype.addEditorView = function(name, content, type, hints,
-    flags) {
+cwc.mode.Modder.prototype.addEditorView = function(name, content, type, hints) {
   let editorInstance = this.helper.getInstance('editor');
   if (editorInstance) {
-    editorInstance.addView(name, content, type, hints, flags);
+    editorInstance.addView(name, content, type, hints);
   }
 };
 
@@ -246,18 +244,6 @@ cwc.mode.Modder.prototype.runPreview = function() {
 };
 
 
-/**
- * Sets editor flags.
- * @param {!cwc.ui.EditorFlags} flags
- */
-cwc.mode.Modder.prototype.setEditorFlags = function(flags) {
-  let editorInstance = this.helper.getInstance('editor');
-  if (editorInstance) {
-    editorInstance.setEditorFlags(flags);
-  }
-};
-
-
 /**
  * @param {boolean} active
  */

src/renderer/internal/html5.js

@@ -95,11 +95,11 @@ cwc.renderer.internal.HTML5.prototype.render = function(
     // C64 screen
     if (script.startsWith('10 ')) {
       css = 'body {color: #6076c5; background: #20398d; font-size: 24px;' +
-        'font-family: "Lucida Console";}';
-      javascript = '';
-      html = '**** COMMODORE 64 BASIC V2 ****<br>' +
+        'font-family: "Lucida Console"; padding: 20px;}';
+      html = ' **** COMMODORE 64 BASIC V2 ****<br>' +
         '64K RAM SYSTEM  38911 BASIC BYTES FREE<br>' +
         'READY.<br><br>Nice try, clever clogs.<br>';
+      javascript = '';
     }
 
     // Simple framework.

src/ui/editor/editor.js

@@ -25,7 +25,6 @@ goog.require('cwc.ui.EditorAutocompleteBlacklistCodes');
 goog.require('cwc.ui.EditorAutocompleteBlacklistKeys');
 goog.require('cwc.ui.EditorAutocompleteList');
 goog.require('cwc.ui.EditorContent');
-goog.require('cwc.ui.EditorFlags');
 goog.require('cwc.ui.EditorHint');
 goog.require('cwc.ui.EditorInfobar');
 goog.require('cwc.ui.EditorToolbar');
@@ -64,9 +63,6 @@ cwc.ui.Editor = function(helper) {
   /** @type {CodeMirror} */
   this.editor = null;
 
-  /** @type {cwc.ui.EditorFlags} */
-  this.editorFlags = new cwc.ui.EditorFlags();
-
   /** @type {Object} */
   this.editorView = {};
 
@@ -182,7 +178,6 @@ cwc.ui.Editor.prototype.decorate = function(node) {
 
   // Render code editor template.
   this.log_.debug('Decorate', this.name, 'into node', this.node);
-  this.editorFlags = new cwc.ui.EditorFlags();
   this.editorView = {};
   this.modified = false;
 
@@ -466,23 +461,6 @@ cwc.ui.Editor.prototype.syncJavaScript = function() {
   }
 };
 
-
-/**
- * @return {cwc.ui.EditorFlags}
- */
-cwc.ui.Editor.prototype.getEditorFlags = function() {
-  return this.editorFlags;
-};
-
-
-/**
- * @param {!cwc.ui.EditorFlags} flags
- */
-cwc.ui.Editor.prototype.setEditorFlags = function(flags) {
-  this.editorFlags = flags;
-};
-
-
 /**
  * Syntax checks for supported formats.
  * @param {!boolean} active
@@ -580,10 +558,8 @@ cwc.ui.Editor.prototype.changeView = function(name) {
  * @param {string=} content
  * @param {cwc.ui.EditorType=} type
  * @param {cwc.ui.EditorHint=} hints
- * @param {cwc.ui.EditorFlags=} flags
  */
-cwc.ui.Editor.prototype.addView = function(name, content = '', type, hints,
-    flags) {
+cwc.ui.Editor.prototype.addView = function(name, content = '', type, hints) {
   if (name in this.editorView) {
     this.log_.error('Editor View', name, 'already exists!');
     return;
@@ -593,7 +569,7 @@ cwc.ui.Editor.prototype.addView = function(name, content = '', type, hints,
     (type ? 'with type ' + type : ''),
     (hints ? 'and hints ' + hints : ''),
     (content ? 'for content:' : ''), content);
-  this.editorView[name] = new cwc.ui.EditorView(content, type, hints, flags);
+  this.editorView[name] = new cwc.ui.EditorView(content, type, hints);
 
   if (this.toolbar) {
     this.toolbar.addView(name);

src/ui/editor/editor_flags.js

@@ -19,21 +19,19 @@
  */
 goog.provide('cwc.ui.EditorView');
 
-goog.require('cwc.ui.EditorFlags');
 goog.require('cwc.ui.EditorHint');
 goog.require('cwc.ui.EditorType');
 
 
 /**
- * @constructor
- * @struct
  * @param {string=} content
  * @param {cwc.ui.EditorType=} type
  * @param {cwc.ui.EditorHint=} hints
- * @param {cwc.ui.EditorFlags=} flags
+ * @constructor
+ * @struct
  * @final
  */
-cwc.ui.EditorView = function(content, type, hints, flags) {
+cwc.ui.EditorView = function(content, type, hints) {
   /** @type {!CodeMirror.Doc} */
   this.doc = new CodeMirror.Doc(content || '');
 
@@ -43,9 +41,6 @@ cwc.ui.EditorView = function(content, type, hints, flags) {
   /** @type {!cwc.ui.EditorHint} */
   this.hints = hints || cwc.ui.EditorHint.UNKNOWN;
 
-  /** @type {!cwc.ui.EditorFlags} */
-  this.flags = flags || new cwc.ui.EditorFlags();
-
   /** @type {number} */
   this.cursorPosition = 0;
 };
@@ -59,15 +54,6 @@ cwc.ui.EditorView.prototype.getDoc = function() {
 };
 
 
-/**
- * @param {!string} name
- * @return {string}
- */
-cwc.ui.EditorView.prototype.getFlag = function(name) {
-  return this.flags.getFlag(name);
-};
-
-
 /**
  * Returns whether the document is currently clean.
  * @return {boolean}