Browse Source

Organizational changes

pull/141/head
Zach Wise 13 years ago
parent
commit
7358924ea0
  1. 15
      .gitignore
  2. 2
      compiled/js/timeline-embed.js
  3. 23
      source/js/Embed/Embed.js

15
.gitignore vendored

@ -2,16 +2,13 @@
.DS_Store* .DS_Store*
dev_examples/ dev_examples/
cdn/ cdn/
<<<<<<< HEAD Embed.CDN.js
======= Embed.CDN.Generator.js
VMM.Timeline.CDN.js compiled/generator.html
CDN.js compiled/index.html
>>>>>>> Canary compiled/js/timeline-embed-cdn.js
compiled/js/timeline-embed-generator.js
*.tmproj *.tmproj
*.tmproject *.tmproject
<<<<<<< HEAD
VMM.Timeline.CDN.js
=======
>>>>>>> Canary
tmtags tmtags
source/gfx/Sprites/ source/gfx/Sprites/

2
compiled/js/timeline-embed.js

File diff suppressed because one or more lines are too long

23
source/js/Embed.js → source/js/Embed/Embed.js

@ -1,7 +1,7 @@
/*! /*!
VéritéCo Timeline Loader 0.3 VéritéCo Timeline Loader 0.6
Designed and built by Zach Wise digitalartwork.net Designed and built by Zach Wise digitalartwork.net
Date: May 22, 2012 Date: May 27, 2012
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -20,8 +20,11 @@
/* CodeKit Import /* CodeKit Import
http://incident57.com/codekit/ http://incident57.com/codekit/
================================================== */ ================================================== */
// @codekit-prepend "lib/Embed.LoadLib.js"; // @codekit-prepend "../lib/Embed.LoadLib.js";
/* REPLACE THIS WITH YOUR BASE PATH FOR TIMELINE
================================================== */
var timeline_path = "http://embed.verite.co/timeline/";
/* TIMELINE LOADER /* TIMELINE LOADER
================================================== */ ================================================== */
@ -30,7 +33,7 @@
/* VARS /* VARS
================================================== */ ================================================== */
var timelinejs, t, te, x, isCDN = false, var timelinejs, t, te, x, isCDN = false,
timeline_js_version = "1.48", timeline_js_version = "1.49",
jquery_version_required = "1.7.1", jquery_version_required = "1.7.1",
jquery_version = "", jquery_version = "",
ready = { ready = {
@ -48,13 +51,13 @@
} }
}, },
path = { path = {
base: "http://embed.verite.co/timeline/", base: timeline_path,
css: "http://embed.verite.co/timeline/css/", css: timeline_path + "css/",
js: "http://embed.verite.co/timeline/js/", js: timeline_path + "js/",
locale: "http://embed.verite.co/timeline/js/locale/", locale: timeline_path + "js/locale/",
jquery: "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js", jquery: "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js",
font: { font: {
css: "http://embed.verite.co/timeline/css/themes/font/", css: timeline_path + "css/themes/font/",
js: "http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js", js: "http://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js",
google: [ 'Bevan::latin', 'Pontano+Sans::latin' ] google: [ 'Bevan::latin', 'Pontano+Sans::latin' ]
} }
@ -72,6 +75,8 @@
js: path.js + 'timeline-min.js?'+timeline_js_version js: path.js + 'timeline-min.js?'+timeline_js_version
}; };
/* BUILD CONFIG /* BUILD CONFIG
================================================== */ ================================================== */
if (typeof url_config == 'object') { if (typeof url_config == 'object') {
Loading…
Cancel
Save