소스 검색

HUE=5872 [core] Fix apiHelper error handling on IE11

Enrico Berti 8 년 전
부모
커밋
44e60d7

+ 2 - 2
desktop/core/src/desktop/static/desktop/js/apiHelper.js

@@ -269,9 +269,9 @@ var ApiHelper = (function () {
           errorMessage = errorResponse.message;
         } else if (typeof errorResponse.statusText !== 'undefined') {
           errorMessage = errorResponse.statusText;
-        } else if (errorResponse.error !== 'undefined' && toString.call(errorResponse.error) === '[object String]' ) {
+        } else if (errorResponse.error !== 'undefined' && Object.prototype.toString.call(errorResponse.error) === '[object String]' ) {
           errorMessage = errorResponse.error;
-        } else if (toString.call(errorResponse) === '[object String]') {
+        } else if (Object.prototype.toString.call(errorResponse) === '[object String]') {
           errorMessage = errorResponse;
         }
       }

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/nv.d3.utils.js

@@ -63,7 +63,7 @@ nv.utils.isFunction = function (a) {
   return typeof a === 'function';
 };
 nv.utils.isDate = function (a) {
-  return toString.call(a) === '[object Date]';
+  return Object.prototype.toString.call(a) === '[object Date]';
 };
 nv.utils.isNumber = function (a) {
   return !isNaN(a) && typeof a === 'number';

+ 0 - 1
desktop/core/src/desktop/static/desktop/spec/sqlAutocompleter3Spec.js

@@ -36,7 +36,6 @@
           suggestKeywords: [{ value: 'BAR', weight: 1 }, { value: 'FOO', weight: 2 }]
         });
         expect(subject.filtered().length).toBe(2);
-        console.log(subject.filtered());
         // Sorted by weight, case adjusted
         expect(subject.filtered()[0].meta).toBe(AutocompleterGlobals.i18n.meta.keyword);
         expect(subject.filtered()[0].value).toBe('foo');