From 8b8a87e63cbdd208ff3c7ca4caec371c70206ef0 Mon Sep 17 00:00:00 2001
From: Adam Werner <adam.werner@castellantech.com>
Date: Fri, 10 Apr 2020 09:16:40 -0400
Subject: [PATCH] angular.isDefined replace to Utilities.isDefined

---
 .../components/umbaceeditor.directive.js      | 26 +++++++++----------
 .../test/lib/angular/angular-mocks.js         |  8 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
index cd1b1d81810b..b4d98031e776 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbaceeditor.directive.js
@@ -24,40 +24,40 @@
 
             // sets the ace worker path, if running from concatenated
             // or minified source
-            if (angular.isDefined(opts.workerPath)) {
+            if (Utilities.isDefined(opts.workerPath)) {
                 var config = window.ace.require('ace/config');
                 config.set('workerPath', opts.workerPath);
             }
 
             // ace requires loading
-            if (angular.isDefined(opts.require)) {
+            if (Utilities.isDefined(opts.require)) {
                 opts.require.forEach(function(n) {
                     window.ace.require(n);
                 });
             }
 
             // Boolean options
-            if (angular.isDefined(opts.showGutter)) {
+            if (Utilities.isDefined(opts.showGutter)) {
                 acee.renderer.setShowGutter(opts.showGutter);
             }
-            if (angular.isDefined(opts.useWrapMode)) {
+            if (Utilities.isDefined(opts.useWrapMode)) {
                 session.setUseWrapMode(opts.useWrapMode);
             }
-            if (angular.isDefined(opts.showInvisibles)) {
+            if (Utilities.isDefined(opts.showInvisibles)) {
                 acee.renderer.setShowInvisibles(opts.showInvisibles);
             }
-            if (angular.isDefined(opts.showIndentGuides)) {
+            if (Utilities.isDefined(opts.showIndentGuides)) {
                 acee.renderer.setDisplayIndentGuides(opts.showIndentGuides);
             }
-            if (angular.isDefined(opts.useSoftTabs)) {
+            if (Utilities.isDefined(opts.useSoftTabs)) {
                 session.setUseSoftTabs(opts.useSoftTabs);
             }
-            if (angular.isDefined(opts.showPrintMargin)) {
+            if (Utilities.isDefined(opts.showPrintMargin)) {
                 acee.setShowPrintMargin(opts.showPrintMargin);
             }
 
             // commands
-            if (angular.isDefined(opts.disableSearch) && opts.disableSearch) {
+            if (Utilities.isDefined(opts.disableSearch) && opts.disableSearch) {
                 acee.commands.addCommands([{
                     name: 'unfind',
                     bindKey: {
@@ -79,7 +79,7 @@
                 session.setMode('ace/mode/' + opts.mode);
             }
             // Advanced options
-            if (angular.isDefined(opts.firstLineNumber)) {
+            if (Utilities.isDefined(opts.firstLineNumber)) {
                 if (angular.isNumber(opts.firstLineNumber)) {
                     session.setOption('firstLineNumber', opts.firstLineNumber);
                 } else if (angular.isFunction(opts.firstLineNumber)) {
@@ -89,7 +89,7 @@
 
             // advanced options
             var key, obj;
-            if (angular.isDefined(opts.advanced)) {
+            if (Utilities.isDefined(opts.advanced)) {
                 for (key in opts.advanced) {
                     // create a javascript object with the key and value
                     obj = {
@@ -102,7 +102,7 @@
             }
 
             // advanced options for the renderer
-            if (angular.isDefined(opts.rendererOptions)) {
+            if (Utilities.isDefined(opts.rendererOptions)) {
                 for (key in opts.rendererOptions) {
                     // create a javascript object with the key and value
                     obj = {
@@ -206,7 +206,7 @@
                      */
                     var args = Array.prototype.slice.call(arguments, 1);
 
-                    if (angular.isDefined(callback)) {
+                    if (Utilities.isDefined(callback)) {
                         scope.$evalAsync(function() {
                             if (angular.isFunction(callback)) {
                                 callback(args);
diff --git a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
index b4a3fb9ed6c2..3b6c9643ffbf 100644
--- a/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
+++ b/src/Umbraco.Web.UI.Client/test/lib/angular/angular-mocks.js
@@ -104,7 +104,7 @@ angular.mock.$Browser = function () {
      * @param {number=} number of milliseconds to flush. See {@link #defer.now}
      */
     self.defer.flush = function (delay) {
-        if (angular.isDefined(delay)) {
+        if (Utilities.isDefined(delay)) {
             self.defer.now += delay;
         } else {
             if (self.deferredFns.length) {
@@ -1267,7 +1267,7 @@ function createHttpBackendMock($rootScope, $delegate, $browser) {
         $rootScope.$digest();
         if (!responses.length) throw Error('No pending request to flush !');
 
-        if (angular.isDefined(count)) {
+        if (Utilities.isDefined(count)) {
             while (count--) {
                 if (!responses.length) throw Error('No more pending request to flush !');
                 responses.shift()();
@@ -1365,8 +1365,8 @@ function MockHttpExpectation(method, url, data, headers) {
     this.match = function (m, u, d, h) {
         if (method != m) return false;
         if (!this.matchUrl(u)) return false;
-        if (angular.isDefined(d) && !this.matchData(d)) return false;
-        if (angular.isDefined(h) && !this.matchHeaders(h)) return false;
+        if (Utilities.isDefined(d) && !this.matchData(d)) return false;
+        if (Utilities.isDefined(h) && !this.matchHeaders(h)) return false;
         return true;
     };