Browse Source

Fix for scrollbars showing up on iframe embedded version of TimelineJS

pull/366/head
Zach Wise 12 years ago
parent
commit
91da88125b
  1. 2
      compiled/js/storyjs-embed.js
  2. 2
      compiled/js/timeline-min.js
  3. 17
      compiled/js/timeline.js
  4. 2
      source/js/Core
  5. 17
      source/js/VMM.Timeline.js

2
compiled/js/storyjs-embed.js

File diff suppressed because one or more lines are too long

2
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

17
compiled/js/timeline.js

@ -6753,18 +6753,9 @@ if(typeof VMM != 'undefined' && typeof VMM.StoryJS == 'undefined') {
* TimelineJS
* Designed and built by Zach Wise at VéritéCo
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* http://www.gnu.org/licenses/
* This Source Code Form is subject to the terms of the Mozilla Public
* 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/.
*/
/* * CodeKit Import
@ -7328,7 +7319,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
*/
}
if (config.width < 640) {
if (config.width < 641) {
VMM.Lib.addClass($timeline, "vco-skinny");
} else {
VMM.Lib.removeClass($timeline, "vco-skinny");

2
source/js/Core

@ -1 +1 @@
Subproject commit 047d7a37d4f5dee40954259316abb4e0064d241f
Subproject commit 407ed9de8e2707a97f6fdcd41667d297774d29a3

17
source/js/VMM.Timeline.js

@ -2,18 +2,9 @@
* TimelineJS
* Designed and built by Zach Wise at VéritéCo
* 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
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* http://www.gnu.org/licenses/
* This Source Code Form is subject to the terms of the Mozilla Public
* 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/.
*/
/* * CodeKit Import
@ -577,7 +568,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
*/
}
if (config.width < 640) {
if (config.width < 641) {
VMM.Lib.addClass($timeline, "vco-skinny");
} else {
VMM.Lib.removeClass($timeline, "vco-skinny");

Loading…
Cancel
Save