Browse Source

Embed- fix icons to work with other icons than 'play'

flex-list
jlukic 9 years ago
parent
commit
815d5284e1
2 changed files with 12 additions and 11 deletions
  1. 11
      src/definitions/modules/embed.js
  2. 12
      src/definitions/modules/embed.less

11
src/definitions/modules/embed.js

@ -51,7 +51,7 @@ $.fn.embed = function(parameters) {
$window = $(window), $window = $(window),
$module = $(this), $module = $(this),
$placeholder = $module.find(selector.placeholder), $placeholder = $module.find(selector.placeholder),
$play = $module.find(selector.play),
$icon = $module.find(selector.icon),
$embed = $module.find(selector.embed), $embed = $module.find(selector.embed),
element = this, element = this,
@ -89,7 +89,7 @@ $.fn.embed = function(parameters) {
refresh: function() { refresh: function() {
module.verbose('Refreshing selector cache'); module.verbose('Refreshing selector cache');
$placeholder = $module.find(selector.placeholder); $placeholder = $module.find(selector.placeholder);
$play = $module.find(selector.play);
$icon = $module.find(selector.icon);
$embed = $module.find(selector.embed); $embed = $module.find(selector.embed);
}, },
@ -97,9 +97,10 @@ $.fn.embed = function(parameters) {
events: function() { events: function() {
if( module.has.placeholder() ) { if( module.has.placeholder() ) {
module.debug('Adding placeholder events'); module.debug('Adding placeholder events');
console.log($module, selector.placeholder);
$module $module
.on('click' + eventNamespace, selector.placeholder, module.createAndShow) .on('click' + eventNamespace, selector.placeholder, module.createAndShow)
.on('click' + eventNamespace, selector.play, module.createAndShow)
.on('click' + eventNamespace, selector.icon, module.createAndShow)
; ;
} }
} }
@ -131,6 +132,7 @@ $.fn.embed = function(parameters) {
createEmbed: function(url) { createEmbed: function(url) {
module.refresh(); module.refresh();
url = url || module.get.url(); url = url || module.get.url();
console.log(url);
$embed = $('<div/>') $embed = $('<div/>')
.addClass(className.embed) .addClass(className.embed)
.html( module.generate.embed(url) ) .html( module.generate.embed(url) )
@ -141,6 +143,7 @@ $.fn.embed = function(parameters) {
}, },
createAndShow: function() { createAndShow: function() {
console.log('cands');
module.createEmbed(); module.createEmbed();
module.show(); module.show();
}, },
@ -584,7 +587,7 @@ $.fn.embed.settings = {
selector : { selector : {
embed : '.embed', embed : '.embed',
placeholder : '.placeholder', placeholder : '.placeholder',
play : '.play'
icon : '.icon'
}, },
sources: { sources: {

12
src/definitions/modules/embed.less

@ -59,10 +59,9 @@
} }
/*-------------- /*--------------
Placeholder
Placeholder
---------------*/ ---------------*/
/* Placeholder Image */
.ui.embed > .placeholder { .ui.embed > .placeholder {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
@ -75,10 +74,9 @@
} }
/*-------------- /*--------------
Play
Icon
---------------*/ ---------------*/
/* Play Icon */
.ui.embed > .icon { .ui.embed > .icon {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
@ -134,11 +132,11 @@
Active Active
---------------*/ ---------------*/
.ui.active.embed .play,
.ui.active.embed .placeholder {
.ui.active.embed > .icon,
.ui.active.embed > .placeholder {
display: none; display: none;
} }
.ui.active.embed .embed {
.ui.active.embed > .embed {
display: block; display: block;
} }

Loading…
Cancel
Save