Merge 238d2fe into c8458cb

abecms · Oct 19, 2017 · 77d9f99 · 77d9f99
2 parents c8458cb + 238d2fe
commit 77d9f99
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/cli/cms/data/sql.js b/src/cli/cms/data/sql.js
@@ -331,7 +331,7 @@ export function executeQuery(match, jsonPage) {
  * @return {String} url | request | value | file | other
  */
 export function getSourceType(str) {
-  if (/http:\/\/|https:\/\//.test(str)) {
+  if(/http:\/\/|https:\/\/|\/\/|(\?(.*)=)/.test(str)) { 
     return 'url'
   }
 

diff --git a/src/cli/cms/editor/handlebars/printInput.js b/src/cli/cms/editor/handlebars/printInput.js
@@ -1,6 +1,6 @@
 import sourceAutocomplete from './sourceAutocomplete'
 import sourceOption from './sourceOption'
-import {abeExtend, User} from '../../../'
+import {abeExtend, User, cmsData} from '../../../'
 
 export function getAttributes(params) {
   var attributes = ''
@@ -52,7 +52,7 @@ export function createInputSource(attributes, inputClass, params) {
     (params.autocomplete != null && params.autocomplete === 'true') ||
     (params.multiple != null && params.multiple === 'multiple')
   ) {
-    if (params.sourceString.indexOf('http') === 0) lastValues = params.source
+    if(cmsData.sql.getSourceType(params.sourceString) === "url") lastValues = params.source
     else lastValues = JSON.stringify(params.source).replace(/\'/g, '&quote;')
     inputSource += '<div class="autocomplete-result-wrapper">'
     if (

diff --git a/src/server/public/abecms/scripts/modules/EditorAutocomplete.js b/src/server/public/abecms/scripts/modules/EditorAutocomplete.js
@@ -438,7 +438,7 @@ export default class EditorAutocomplete {
         }
       }
 
-      if (dataVal.indexOf('http') === 0) {
+      if(/http:\/\/|https:\/\/|\/\/|(\?(.*)=)/.test(dataVal)) { 
         this._ajax(
           {
             url: `${dataVal}${val}`,