playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix for showing Google Static Maps closes #9

pull/23/merge
Zach Wise 13 years ago
parent
3c0e650d85
commit
281c1fbeab
13 changed files with 48 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      locale/de.js
  2. 8
      locale/en.js
  3. 8
      locale/es.js
  4. 8
      locale/fr.js
  5. 8
      locale/it.js
  6. 8
      locale/kr.js
  7. 8
      locale/nl.js
  8. 8
      locale/pt-br.js
  9. 8
      locale/zh-ch.js
  10. 8
      locale/zh-tw.js
  11. 4
      source/js/VMM.MediaType.js
  12. 8
      timeline-min.js
  13. 4
      timeline.js

8
locale/de.js
View File

File diff suppressed because one or more lines are too long

8
locale/en.js
View File

File diff suppressed because one or more lines are too long

8
locale/es.js
View File

File diff suppressed because one or more lines are too long

8
locale/fr.js
View File

File diff suppressed because one or more lines are too long

8
locale/it.js
View File

File diff suppressed because one or more lines are too long

8
locale/kr.js
View File

File diff suppressed because one or more lines are too long

8
locale/nl.js
View File

File diff suppressed because one or more lines are too long

8
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

8
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

4
source/js/VMM.MediaType.js
Unescape View File

@ -53,7 +53,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.type = "twitter";
media.id = twitter_id;
success = true;
} else if (d.match("maps.google")) {
} else if (d.match("maps.google") && !d.match("staticmap")) {
//maps.google.com
media.type = "google-map";
media.id = d.split(/src=['|"][^'|"]*?['|"]/gi);
@ -68,7 +68,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
//media.id = media.id.split("/")[1];
//trace("FLICKR " + media.id);
success = true;
} else if (d.match(/jpg|jpeg|png|gif/i)) {
} else if (d.match(/jpg|jpeg|png|gif/i) || d.match("staticmap")) {
media.type = "image";
media.id = d;
success = true;

8
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

4
timeline.js
Unescape View File

@ -1977,7 +1977,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
media.type = "twitter";
media.id = twitter_id;
success = true;
} else if (d.match("maps.google")) {
} else if (d.match("maps.google") && !d.match("staticmap")) {
//maps.google.com
media.type = "google-map";
media.id = d.split(/src=['|"][^'|"]*?['|"]/gi);
@ -1992,7 +1992,7 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
//media.id = media.id.split("/")[1];
//trace("FLICKR " + media.id);
success = true;
} else if (d.match(/jpg|jpeg|png|gif/i)) {
} else if (d.match(/jpg|jpeg|png|gif/i) || d.match("staticmap")) {
media.type = "image";
media.id = d;
success = true;

Write Preview
Loading…
Cancel
Save