From 0dee563fb1766dfbe45b1b51dec933b7a3c2cb81 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 18 Oct 2019 20:49:28 -0700 Subject: [PATCH] afform_html - Fix typo in module name ("afMoncao"/"afMonaco") --- .../html/ang/{afMoncao.ang.php => afMonaco.ang.php} | 10 +++++----- ext/afform/html/ang/afMonaco.css | 4 ++++ ext/afform/html/ang/{afMoncao.js => afMonaco.js} | 6 +++--- ext/afform/html/ang/afMoncao.css | 4 ---- 4 files changed, 12 insertions(+), 12 deletions(-) rename ext/afform/html/ang/{afMoncao.ang.php => afMonaco.ang.php} (75%) create mode 100644 ext/afform/html/ang/afMonaco.css rename ext/afform/html/ang/{afMoncao.js => afMonaco.js} (93%) delete mode 100644 ext/afform/html/ang/afMoncao.css diff --git a/ext/afform/html/ang/afMoncao.ang.php b/ext/afform/html/ang/afMonaco.ang.php similarity index 75% rename from ext/afform/html/ang/afMoncao.ang.php rename to ext/afform/html/ang/afMonaco.ang.php index 81e069f248..5c99071e21 100644 --- a/ext/afform/html/ang/afMoncao.ang.php +++ b/ext/afform/html/ang/afMonaco.ang.php @@ -6,12 +6,12 @@ return array( 'js' => [ AFFORM_HTML_MONACO . '/loader.js', - 'ang/afMoncao.js', - // 'ang/afMoncao/*.js', - // 'ang/afMoncao/*/*.js', + 'ang/afMonaco.js', + // 'ang/afMonaco/*.js', + // 'ang/afMonaco/*/*.js', ], - 'css' => ['ang/afMoncao.css'], - // 'partials' => ['ang/afMoncao'], + 'css' => ['ang/afMonaco.css'], + // 'partials' => ['ang/afMonaco'], 'requires' => ['crmUi', 'crmUtil'], 'settings' => [ 'paths' => [ diff --git a/ext/afform/html/ang/afMonaco.css b/ext/afform/html/ang/afMonaco.css new file mode 100644 index 0000000000..01029b1f2b --- /dev/null +++ b/ext/afform/html/ang/afMonaco.css @@ -0,0 +1,4 @@ +/* Add any CSS rules for Angular module "afMonaco" */ +.af-monaco-container { + border:1px solid grey; +} \ No newline at end of file diff --git a/ext/afform/html/ang/afMoncao.js b/ext/afform/html/ang/afMonaco.js similarity index 93% rename from ext/afform/html/ang/afMoncao.js rename to ext/afform/html/ang/afMonaco.js index 6d47f4ea07..3e0009b7af 100644 --- a/ext/afform/html/ang/afMoncao.js +++ b/ext/afform/html/ang/afMonaco.js @@ -1,9 +1,9 @@ (function(angular, $, _) { - angular.module('afMoncao', CRM.angRequires('afMoncao')); + angular.module('afMonaco', CRM.angRequires('afMonaco')); // "afMonaco" is a basic skeletal directive. // Example usage:
- angular.module('afMoncao').directive('afMonaco', function($timeout) { + angular.module('afMonaco').directive('afMonaco', function($timeout) { return { restrict: 'AE', require: 'ngModel', @@ -11,7 +11,7 @@ link: function($scope, $el, $attr, ngModel) { var heightPct = 0.70; var editor; - require.config({paths: CRM.afMoncao.paths}); + require.config({paths: CRM.afMonaco.paths}); require(['vs/editor/editor.main'], function() { var editorEl = $el.find('.af-monaco-container'); editorEl.css({height: Math.round(heightPct * $(window).height())}); diff --git a/ext/afform/html/ang/afMoncao.css b/ext/afform/html/ang/afMoncao.css deleted file mode 100644 index 58ed3679e4..0000000000 --- a/ext/afform/html/ang/afMoncao.css +++ /dev/null @@ -1,4 +0,0 @@ -/* Add any CSS rules for Angular module "afMoncao" */ -.af-monaco-container { - border:1px solid grey; -} \ No newline at end of file -- 2.25.1