Move isUrlYoutubeVideo function into Helpers class

surveyjs · Sep 9, 2024 · 2934162 · 2934162
1 parent f8fa6af
commit 2934162
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/packages/survey-core/src/helpers.ts b/packages/survey-core/src/helpers.ts
@@ -431,6 +431,16 @@ export class Helpers {
  }
  return len1 === len2 ? 0 : (len1 < len2 ? -1 : 1);
  }
+ public static isUrlYoutubeVideo(url: string): boolean {
+ if (!url) return false;
+ const youtubeDomains = ["www.youtube.com", "m.youtube.com", "youtube.com", "youtu.be"];
+ url = url.toLowerCase();
+ url = url.replace(/^https?:\/\//, "");
+ for (let i = 0; i < youtubeDomains.length; i++) {
+ if (url.indexOf(youtubeDomains[i] + "/") === 0) return true;
+ }
+ return false;
+ }
 }
 if (!(<any>String.prototype)["format"]) {
  (<any>String.prototype)["format"] = function() {

diff --git a/packages/survey-core/src/question_image.ts b/packages/survey-core/src/question_image.ts
@@ -4,22 +4,12 @@ import { QuestionFactory } from "./questionfactory";
 import { LocalizableString } from "./localizablestring";
 import { CssClassBuilder } from "./utils/cssClassBuilder";
 import { getRenderedStyleSize, getRenderedSize } from "./utils/utils";
+import { Helpers } from "./helpers";
 
-const youtubeDomains = ["www.youtube.com", "m.youtube.com", "youtube.com", "youtu.be"];
 const videoSuffics = [".mp4", ".mov", ".wmv", ".flv", ".avi", ".mkv"];
 const youtubeUrl = "https://www.youtube.com/";
 const youtubeEmbed = "embed";
 
-function isUrlYoutubeVideo(url: string): boolean {
- if (!url) return false;
- url = url.toLowerCase();
- url = url.replace(/^https?:\/\//, "");
- for (let i = 0; i < youtubeDomains.length; i++) {
- if (url.indexOf(youtubeDomains[i] + "/") === 0) return true;
- }
- return false;
-}
-
 /**
  * A class that describes the Image question type. Unlike other question types, Image cannot have a title or value.
  *
@@ -191,7 +181,7 @@ export class QuestionImageModel extends QuestionNonValue {
  }
  }
  private isYoutubeVideo(): boolean {
- return isUrlYoutubeVideo(this.imageLink);
+ return Helpers.isUrlYoutubeVideo(this.imageLink);
  }
  private isVideo(): boolean {
  let link = this.imageLink;
@@ -205,8 +195,7 @@ export class QuestionImageModel extends QuestionNonValue {
 }
 
 function getCorrectImageLink(val: string, isYouTube: boolean): string {
- if (!val || !isUrlYoutubeVideo(val)) return isYouTube ? "" : val;
- //if(!val || !isUrlYoutubeVideo(val)) return val;
+ if (!val || !Helpers.isUrlYoutubeVideo(val)) return isYouTube ? "" : val;
  let res = val.toLocaleLowerCase();
  if(res.indexOf(youtubeEmbed) > -1) return val;
  let id = "";