Skip to content

Commit 86d8d5b

Browse files
Update timber core - freeze plugin discontinued - loadmedia added by default
1 parent 56dd960 commit 86d8d5b

File tree

6 files changed

+31
-289
lines changed

6 files changed

+31
-289
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "timbercss",
3-
"version": "0.1.56",
3+
"version": "0.1.57",
44
"author": "UnlimitDesign",
55
"description": "A CSS Framework for Rapid Website Prototyping",
66
"keywords": [],

src/js/_tm.core.js

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
// Copyright © UnlimitDesign 2019
22
// Plugin: Timber core
3-
// Version: 1.0.0
3+
// Version: 1.0.1
44
// URL: @UnlimitDesign
55
// Author: UnlimitDesign, Christian Lundgren, Shu Miyao
66
// Description: Creates instances of timber plugins
77
// License: MIT
88

99
// Utilities
1010
import tmInView from './utilities/_tm.inview.js';
11+
import tmLoadMedia from './utilities/_tm.loadmedia.js';
1112

1213
// Components
1314
import tmAccordion from './components/_tm.accordion.js';
14-
import tmTabs from './components/_tm.tabs.js';
1515
import tmCollapsable from './components/_tm.collapsable.js';
16-
import tmRollover from './components/_tm.rollover.js';
1716
import tmDismissable from './components/_tm.dismissable.js';
1817
import tmDropdown from './components/_tm.dropdown.js';
18+
import tmOverlayNavigation from './components/_tm.overlaynavigation.js';
19+
import tmRollover from './components/_tm.rollover.js';
1920
import tmScrollTo from './components/_tm.scrollto.js';
2021
import tmSideNavigation from './components/_tm.sidenavigation.js';
21-
import tmOverlayNavigation from './components/_tm.overlaynavigation.js';
2222
import tmToggleSubMenu from './components/_tm.togglesubmenu.js';
23+
import tmTabs from './components/_tm.tabs.js';
2324

2425
// Plugins
25-
import tmMasonryGrid from './plugins/_tm.masonrygrid.js';
26-
import tmFreeze from './plugins/_tm.freeze.js';
27-
import tmStickyHeader from './plugins/_tm.stickyheader.js';
28-
import tmLightbox from './plugins/_tm.lightbox.js';
2926
import tmHorizon from './plugins/_tm.horizon.js';
27+
import tmLightbox from './plugins/_tm.lightbox.js';
28+
import tmMasonryGrid from './plugins/_tm.masonrygrid.js';
3029
import tmParallax from './plugins/_tm.parallax.js';
3130
import tmResponsiveVideo from './plugins/_tm.responsivevideo.js';
31+
import tmStickyHeader from './plugins/_tm.stickyheader.js';
3232

3333
const timberCore = (function () {
3434

@@ -41,24 +41,26 @@ const timberCore = (function () {
4141
// Set the plugin defaults
4242
const defaults = {
4343
initialize: true,
44+
inview: '.observe',
45+
loadmedia: '.preload-media',
46+
4447
accordion: '.accordion',
4548
collapsable: '.collapsable',
4649
dismissable: '.dismissable',
4750
dropdown: '.dropdown',
48-
freeze: '.freeze',
49-
horizon: '.horizon',
50-
lightbox: '.lightbox',
51-
grid: '.grid.preload',
52-
inview: '.observe',
5351
overlaynav: '.overlay-nav-show',
5452
rollover: '.thumbnail',
5553
scrollto: '.scroll-to',
5654
sidenav: '.side-nav-show',
57-
stickyheader: '.header',
55+
togglesubmenu: '.toggle-sub-menus',
5856
tabs: '.tabs',
59-
subMenus: '.toggle-sub-menus',
57+
58+
horizon: '.horizon',
59+
lightbox: '.lightbox',
60+
masonrygrid: '.grid.preload',
6061
parallax: '.parallax',
61-
responsiveVideo: '.video'
62+
responsiveVideo: '.video',
63+
stickyheader: '.header'
6264
};
6365

6466
// Create an empty plugin object
@@ -71,26 +73,26 @@ const timberCore = (function () {
7173
plugin.defaults = defaults;
7274
plugin.options = options;
7375
plugin.settings = Object.assign({}, defaults, options);
74-
plugin.module = { accordion: null, collapsable: null, dismissable: null, dropdown: null, freeze: null, horizon: null, grid: null, inview: null, overlaynavigation: null, rollover: null, scrollto: null, sidenavigation: null, stickyheader: null, tabs: null, togglesubmenu: null };
76+
plugin.module = { inview: null, loadmedia: null, accordion: null, collapsable: null, dismissable: null, dropdown: null, horizon: null, masonrygrid: null, overlaynavigation: null, rollover: null, scrollto: null, sidenavigation: null, stickyheader: null, tabs: null, togglesubmenu: null };
7577

7678
// Create instances if module exists
7779
if (typeof tmAccordion != 'undefined') plugin.module.accordion = new tmAccordion(plugin.settings.accordion);
7880
if (typeof tmCollapsable != 'undefined') plugin.module.collapsable = new tmCollapsable(plugin.settings.collapsable);
7981
if (typeof tmDismissable != 'undefined') plugin.module.dismissable = new tmDismissable(plugin.settings.dismissable);
8082
if (typeof tmDropdown != 'undefined') plugin.module.dropdown = new tmDropdown(plugin.settings.dropdown);
81-
if (typeof tmFreeze != 'undefined') plugin.module.freeze = new tmFreeze(plugin.settings.freeze);
8283
if (typeof tmLightbox != 'undefined') plugin.module.lightbox = new tmLightbox(plugin.settings.lightbox);
8384
if (typeof tmHorizon != 'undefined') plugin.module.horizon = new tmHorizon(plugin.settings.horizon);
84-
if (typeof tmMasonryGrid != 'undefined') plugin.module.grid = new tmMasonryGrid(plugin.settings.grid);
85+
if (typeof tmMasonryGrid != 'undefined') plugin.module.masonrygrid = new tmMasonryGrid(plugin.settings.masonrygrid);
8586
if (typeof tmInView != 'undefined') plugin.module.inview = new tmInView(plugin.settings.inview);
87+
if (typeof tmLoadMedia != 'undefined') plugin.module.loadmedia = new tmLoadMedia(plugin.settings.loadmedia);
8688
if (typeof tmOverlayNavigation != 'undefined') plugin.module.overlaynavigation = new tmOverlayNavigation(plugin.settings.overlaynav);
8789
if (typeof tmParallax != 'undefined') plugin.module.parallax = new tmParallax(plugin.settings.parallax);
8890
if (typeof tmRollover != 'undefined') plugin.module.rollover = new tmRollover(plugin.settings.rollover);
8991
if (typeof tmScrollTo != 'undefined') plugin.module.scrollto = new tmScrollTo(plugin.settings.scrollto);
9092
if (typeof tmSideNavigation != 'undefined') plugin.module.sidenavigation = new tmSideNavigation(plugin.settings.sidenav);
9193
if (typeof tmStickyHeader != 'undefined') plugin.module.stickyheader = new tmStickyHeader(plugin.settings.stickyheader);
9294
if (typeof tmTabs != 'undefined') plugin.module.tabs = new tmTabs(plugin.settings.tabs);
93-
if (typeof tmToggleSubMenu != 'undefined') plugin.module.togglesubmenu = new tmToggleSubMenu(plugin.settings.subMenus);
95+
if (typeof tmToggleSubMenu != 'undefined') plugin.module.togglesubmenu = new tmToggleSubMenu(plugin.settings.togglesubmenu);
9496
if (typeof tmResponsiveVideo != 'undefined') plugin.module.responsivevideo = new tmResponsiveVideo(plugin.settings.responsiveVideo);
9597
} catch (error) {
9698
console.log(`${error} - ensure module is imported or instantiate specific plugin instead of core, for example: plugin.module.moduleName.initialize();`);

src/js/plugins/_tm.freeze.js

Lines changed: 0 additions & 260 deletions
This file was deleted.

src/js/plugins/_tm.lightbox.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Import utilities
1010
import classList from '../utilities/_chaining.js';
11-
import loadMedia from '../utilities/_tm.loadmedia.js';
11+
import tmLoadMedia from '../utilities/_tm.loadmedia.js';
1212
import passiveSupported from '../utilities/_passivesupported.js';
1313

1414
const tmLightbox = (function () {
@@ -463,8 +463,8 @@ const tmLightbox = (function () {
463463
// Hide/show toolbar buttons based on type
464464
showHideZoom(mediaSrc.type);
465465

466-
// Create instance of loadMedia
467-
lightboxItemToLoad = new loadMedia(mediaToLoad,{
466+
// Create instance of tmLoadMedia
467+
lightboxItemToLoad = new tmLoadMedia(mediaToLoad,{
468468
backgroundImage: false,
469469
onLoaded: function(loadedMedia){
470470

0 commit comments

Comments
 (0)