Browse Source

Fix for problematic whitespace in media urls

pull/197/head
Zach Wise 12 years ago
parent
commit
712c4d4381
  1. 26
      compiled/js/timeline-min.js
  2. 23
      compiled/js/timeline.js
  3. 2
      source/js/Core

26
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

23
compiled/js/timeline.js

@ -21,13 +21,15 @@
Begin VMM.js Begin VMM.js
***********************************************/ ***********************************************/
/* VéritéCo JS Master /**
Version: 0.6 * VéritéCo JS Core
Date: June 19, 2012 * Designed and built by Zach Wise at VéritéCo zach@verite.co
Copyright 2012 VéritéCo unless part of TimelineJS,
if part of TimelineJS then it inherits TimelineJS's license. * This Source Code Form is subject to the terms of the Mozilla Public
Designed and built by Zach Wise digitalartwork.net * License, v. 2.0. If a copy of the MPL was not distributed with this
================================================== */ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/* Simple JavaScript Inheritance /* Simple JavaScript Inheritance
@ -1164,7 +1166,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Browser == 'undefined') {
if(typeof VMM != 'undefined' && typeof VMM.FileExtention == 'undefined') { if(typeof VMM != 'undefined' && typeof VMM.FileExtention == 'undefined') {
VMM.FileExtention = { VMM.FileExtention = {
googleDocType: function(url) { googleDocType: function(url) {
var fileName = url, var fileName = url.replace(/\s\s*$/, ''),
fileExtension = "", fileExtension = "",
validFileExtensions = ["DOC","DOCX","XLS","XLSX","PPT","PPTX","PDF","PAGES","AI","PSD","TIFF","DXF","SVG","EPS","PS","TTF","XPS","ZIP","RAR"], validFileExtensions = ["DOC","DOCX","XLS","XLSX","PPT","PPTX","PDF","PAGES","AI","PSD","TIFF","DXF","SVG","EPS","PS","TTF","XPS","ZIP","RAR"],
flag = false; flag = false;
@ -3663,8 +3665,9 @@ if(typeof VMM != 'undefined' && typeof VMM.MediaElement == 'undefined') {
================================================== */ ================================================== */
if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') { if(typeof VMM != 'undefined' && typeof VMM.MediaType == 'undefined') {
VMM.MediaType = function(d) { VMM.MediaType = function(_d) {
var success = false, var d = _d.replace(/^\s\s*/, '').replace(/\s\s*$/, ''),
success = false,
media = { media = {
type: "unknown", type: "unknown",
id: "", id: "",

2
source/js/Core

@ -1 +1 @@
Subproject commit e07bf092474aa2510e2152f0889d67a3f195b07f Subproject commit a610cc8f532caceeed6d2210b7ecf5c39ed976be
Loading…
Cancel
Save