Skip to content

Commit

Permalink
Recompiled JS and CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
@vitmalina
vitmalina committed Dec 31, 2015
1 parent bd0765b commit 14d6d9f
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 22 deletions.
27 changes: 27 additions & 0 deletions dist/w2ui-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2543,6 +2543,33 @@ button.w2ui-btn-small:focus:before {
left: 0px;
right: 0px;
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-left,
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-right {
position: absolute;
right: 2px;
top: 2px;
height: 24px;
padding: 5px;
border-radius: 2px;
background-size: 16px 12px;
background-position: center center;
background-repeat: no-repeat;
background-color: #323948;
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-left:hover,
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-right:hover {
background-color: #373f52;
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-left {
left: auto;
width: 25px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAA0ElEQVR4Ae2TGxADMRCG6xa3uJ1Tn+sTt7qdW9zOLW5xi1vc1u1qO/90dnb+mxYvsW/fr8vf3/kkicpufzFegbbIQQPFavQGVCU7ho7ilGR8AF+j+BMUi9EVaI/MUbFFXfHNM9YJ6Tc2/Y6KUVd887dgnX5Xbsenv7LTr5h+0BVu+kFXiPgVytrhJ3b/VbLbgeqaxrsmiZiBW28xWoCO2MHC7SHbyg1GqcQhBxUzt+hWPIEPrz+HDwr7w5003sT2+0YovxFNun1TlQL0K4fzfQCOU3iWmTMskgAAAABJRU5ErkJggg==');
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-right {
left: 2px;
width: auto;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAA0klEQVR4Ae2UHRDFMBCEn1vc4lan99f1iVvc6la3utUtbnGLW9zes2Rh56Z/2Kvt/Uz2u5s+7uiBiNS+qakOiT4vGqm04te+V9MnUpP9hkClhQYX0qM9IlFpt/EitcJZAzzZqN0xFhox617tWPMZ7BGZSkNTI6lZNkrHBc7mIwMzO2Y+G1Bqx4LPuv0ikuaD1xGUYSNKDPp0sDLIrRcZ5X7ykWMqTGDrDrwcu+he7VNSOXeH0Xp+OfVT0bcGL6hs2L7fv/0s8QVNxX5+NqhcH3f8ARs3eQH4pzWcAAAAAElFTkSuQmCC');
}
.w2ui-sidebar .w2ui-sidebar-bottom {
position: absolute;
z-index: 2;
Expand Down
2 changes: 1 addition & 1 deletion dist/w2ui-dark.min.css
View file

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions dist/w2ui.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2529,6 +2529,33 @@ button.w2ui-btn-small:focus:before {
left: 0px;
right: 0px;
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-left,
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-right {
position: absolute;
right: 2px;
top: 2px;
height: 24px;
padding: 5px;
border-radius: 2px;
background-size: 16px 12px;
background-position: center center;
background-repeat: no-repeat;
background-color: #edf1f6;
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-left:hover,
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-right:hover {
background-color: #d7e1ef;
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-left {
left: auto;
width: 25px;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAzklEQVR4Ae2THRDEMBCFzy1ucatb3eJ2uhi3uNUtbnGrW9zi1rOdNzdvdl7nDpvYt/9/r7+/51myZZf/zXkD2iMHHRSb0x3oskwMieK05PwEXqP4ExSL0wp0ROao2OOuMPOMdUL6XU1/oGLcFWb+NqyTd2W/P/2qTr9h+nFXhOkHXRHiNyjrgp/U/V+WaQcaNY13zZI0A1JvcVqAnrGDTdtDtZUHjHIJhxxVLN0iqXgCP1l/7h8U9kc6abyJ4/eNWPpGdBv+XdUK0K8cnvcBly2rDr7C1HQAAAAASUVORK5CYII=');
}
.w2ui-sidebar .w2ui-sidebar-top .w2ui-flat-right {
left: 2px;
width: auto;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAQAAADZc7J/AAAAz0lEQVR4Ae2UG7TGMBCEr1vd4la3uMUtuli3utWtbnGLW9zi9l/bDMzJG7u12cfJfLunf1+UEC9Bv0vVQwJ8hjRCaZafflb1C9RQf4OD0gSDE+i+PiJAabFhQc1y1AYYsJGLY3lgxM17uWPO56yPiFDqVPWgRtpIHSd1zPnwkBsdI58OlNwx4fP2X0TgfMTOoHSdKOXkpyNvEyQh7ul+4swxJSTQuwNDxz68l/ukVNbu0Neen5Z+KvzWxBAqHds349uPFJ/jVOrPjxUq++OLf+20q5+noXo0AAAAAElFTkSuQmCC');
}
.w2ui-sidebar .w2ui-sidebar-bottom {
position: absolute;
z-index: 2;
Expand Down
48 changes: 32 additions & 16 deletions dist/w2ui.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13169,18 +13169,15 @@ var w2confirm = function (msg, title, callBack) {
* - reorder with dgrag and drop
* - node.style is misleading - should be there to apply color for example
* - add multiselect
* - add renderer for the node
*
* == 1.5 changes
* - $('#sidebar').w2sidebar() - if called w/o argument then it returns sidebar object
* - add route property that would navigate to a #route
* - return ids of all subitems
* - added w2sidebar.flat
* - added focus(), blur(), onFocus, onBlur
* - unselect w/o arguments will unselect selected node
* - added hasFocus property
* - node.render deprecated, nd.text can be a function (where this word is the item)
* - node.collapsible - defines if it can be collapsed
* - unselect w/o arguments will unselect selected node
* - flatBtn, goFlat, onFlat
*
************************************************************************/

Expand All @@ -13199,6 +13196,7 @@ var w2confirm = function (msg, title, callBack) {
this.style = '';
this.topHTML = '';
this.bottomHTML = '';
this.flatButton = false;
this.keyboard = true;
this.flat = false;
this.hasFocus = false;
Expand Down Expand Up @@ -13258,6 +13256,7 @@ var w2confirm = function (msg, title, callBack) {
onDestroy : null,
onFocus : null,
onBlur : null,
onFlat : null,

node: {
id : null,
Expand All @@ -13284,8 +13283,7 @@ var w2confirm = function (msg, title, callBack) {
onCollapse : null,
// internal
parent : null, // node object
sidebar : null,
render : null // custom render function(node)
sidebar : null
},

add: function (parent, nodes) {
Expand Down Expand Up @@ -13837,6 +13835,17 @@ var w2confirm = function (msg, title, callBack) {
obj.trigger($.extend(edata, { phase: 'after' }));
},

goFlat: function () {
// event before
var edata = this.trigger({ phase: 'before', type: 'flat', goFlat: !this.flat });
if (edata.isCancelled === true) return;
// default action
this.flat = !this.flat;
this.refresh();
// event after
this.trigger($.extend(edata, { phase: 'after' }));
},

render: function (box) {
var time = (new Date()).getTime();
var obj = this;
Expand Down Expand Up @@ -13871,8 +13880,12 @@ var w2confirm = function (msg, title, callBack) {
});
if ($(this.box).length > 0) $(this.box)[0].style.cssText += this.style;
// adjust top and bottom
if (this.topHTML !== '') {
$(this.box).find('.w2ui-sidebar-top').html(this.topHTML);
var flatHTML = '';
if (this.flatButton == true) {
flatHTML = '<div class="w2ui-flat-'+ (this.flat ? 'right' : 'left') +'" onclick="w2ui[\''+ this.name +'\'].goFlat()"></div>';
}
if (this.topHTML !== '' || flatHTML != '') {
$(this.box).find('.w2ui-sidebar-top').html(this.topHTML + flatHTML);
$(this.box).find('.w2ui-sidebar-div')
.css('top', $(this.box).find('.w2ui-sidebar-top').height() + 'px');
}
Expand All @@ -13886,11 +13899,11 @@ var w2confirm = function (msg, title, callBack) {
$(this.box).find('#sidebar_'+ this.name + '_focus')
.on('focus', function (event) {
clearTimeout(kbd_timer);
if (!obj.hasFocus) obj.focus();
if (!obj.hasFocus) obj.focus(event);
})
.on('blur', function (event) {
kbd_timer = setTimeout(function () {
if (obj.hasFocus) { obj.blur(); }
if (obj.hasFocus) { obj.blur(event); }
}, 100);
})
.on('keydown', function (event) {
Expand Down Expand Up @@ -13922,8 +13935,12 @@ var w2confirm = function (msg, title, callBack) {
fullRefresh: (id != null ? false : true) });
if (edata.isCancelled === true) return;
// adjust top and bottom
if (this.topHTML !== '') {
$(this.box).find('.w2ui-sidebar-top').html(this.topHTML);
var flatHTML = '';
if (this.flatButton == true) {
flatHTML = '<div class="w2ui-flat-'+ (this.flat ? 'right' : 'left') +'" onclick="w2ui[\''+ this.name +'\'].goFlat()"></div>';
}
if (this.topHTML !== '' || flatHTML !== '') {
$(this.box).find('.w2ui-sidebar-top').html(this.topHTML + flatHTML);
$(this.box).find('.w2ui-sidebar-div')
.css('top', $(this.box).find('.w2ui-sidebar-top').height() + 'px');
}
Expand Down Expand Up @@ -14000,7 +14017,7 @@ var w2confirm = function (msg, title, callBack) {
' onmouseout="jQuery(this).find(\'span:nth-child(1)\').css(\'color\', \'transparent\')" '+
' onmouseover="jQuery(this).find(\'span:nth-child(1)\').css(\'color\', \'inherit\')">'+
((nd.groupShowHide && nd.collapsible) ? '<span>'+ (!nd.hidden && nd.expanded ? w2utils.lang('Hide') : w2utils.lang('Show')) +'</span>' : '<span></span>') +
(typeof nd.text == 'function' ? nd.text.call(nd) : '<span>'+ nd.text +'</span>') +
(typeof nd.text == 'function' ? nd.text.call(obj, nd) : '<span>'+ nd.text +'</span>') +
'</div>'+
'<div class="w2ui-node-sub" id="node_'+ nd.id +'_sub" style="'+ nd.style +';'+ (!nd.hidden && nd.expanded ? '' : 'display: none;') +'"></div>';
if (obj.flat) {
Expand All @@ -14013,7 +14030,7 @@ var w2confirm = function (msg, title, callBack) {
if (img) tmp = '<div class="w2ui-node-image w2ui-icon '+ img + (nd.selected && !nd.disabled ? " w2ui-icon-selected" : "") +'"></div>';
if (icon) tmp = '<div class="w2ui-node-image"><span class="'+ icon +'"></span></div>';
var text = nd.text;
if (typeof nd.text == 'function') text = nd.text.call(nd);
if (typeof nd.text == 'function') text = nd.text.call(obj, nd);
html = '<div class="w2ui-node '+ (nd.selected ? 'w2ui-selected' : '') +' '+ (nd.disabled ? 'w2ui-disabled' : '') +'" id="node_'+ nd.id +'" style="'+ (nd.hidden ? 'display: none;' : '') +'"'+
' ondblclick="w2ui[\''+ obj.name +'\'].dblClick(\''+ nd.id +'\', event);"'+
' oncontextmenu="w2ui[\''+ obj.name +'\'].contextMenu(\''+ nd.id +'\', event);"'+
Expand Down Expand Up @@ -14095,7 +14112,6 @@ var w2confirm = function (msg, title, callBack) {
$.extend(w2sidebar.prototype, w2utils.event);
w2obj.sidebar = w2sidebar;
})(jQuery);

/************************************************************************
* Library: Web 2.0 UI for jQuery (using prototypical inheritance)
* - Following objects defined
Expand Down
2 changes: 1 addition & 1 deletion dist/w2ui.min.css
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions dist/w2ui.min.js
View file

Large diffs are not rendered by default.

0 comments on commit 14d6d9f

Please sign in to comment.