Skip to content

Commit

Permalink
fix selectize.js jslint and compiled assets
Browse files Browse the repository at this point in the history
  • Loading branch information
JoelAlphonso committed Jun 8, 2017
1 parent 44f0c95 commit 6d4af12
Show file tree
Hide file tree
Showing 16 changed files with 159 additions and 103 deletions.
7 changes: 4 additions & 3 deletions assets/dist/elfinder/css/elfinder.full.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* elFinder - file manager for web
* Version 2.1.21 (2017-02-08)
* Version 2.1.22 (2017-02-25)
* http://elfinder.org
*
* Copyright 2009-2017, Studio 42
Expand Down Expand Up @@ -889,7 +889,7 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
/* file container */
.elfinder-cwd-view-icons .elfinder-cwd-file {
width:120px;
height:80px;
height:90px;
padding-bottom:2px;
cursor:default;
border:none;
Expand All @@ -908,7 +908,7 @@ div.elfinder-cwd-wrapper-list tr.ui-state-default td span.ui-icon {
}*/

/* ltr/rtl enviroment */
.elfinder-ltr .elfinder-cwd-view-icons .elfinder-cwd-file { float:left; margin:0 3px 12px 0; }
.elfinder-ltr .elfinder-cwd-view-icons .elfinder-cwd-file { float:left; margin:0 3px 2px 0; }
.elfinder-rtl .elfinder-cwd-view-icons .elfinder-cwd-file { float:right; margin:0 0 5px 3px; }

/* remove ui hover class border */
Expand Down Expand Up @@ -1507,6 +1507,7 @@ tr.elfinder-cwd-file td .elfinder-cwd-select {
.elfinder-cwd-wrapper-empty .elfinder-cwd-view-list.elfinder-cwd:after {
margin-top: 0;
}

/* File: /css/dialog.css */
/*********************************************/
/* DIALOGS STYLES */
Expand Down
4 changes: 2 additions & 2 deletions assets/dist/elfinder/css/elfinder.min.css

Large diffs are not rendered by default.

52 changes: 32 additions & 20 deletions assets/dist/elfinder/js/elfinder.full.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* elFinder - file manager for web
* Version 2.1.21 (2017-02-08)
* Version 2.1.22 (2017-02-25)
* http://elfinder.org
*
* Copyright 2009-2017, Studio 42
Expand Down Expand Up @@ -6906,7 +6906,7 @@ if (!Object.keys) {
*
* @type String
**/
elFinder.prototype.version = '2.1.21';
elFinder.prototype.version = '2.1.22';



Expand Down Expand Up @@ -8104,7 +8104,7 @@ elFinder.prototype._options.commandsOptions.netmount = {
port : $('<input type="text" placeholder="21"/>'),
path : $('<input type="text" value="/"/>'),
user : $('<input type="text"/>'),
pass : $('<input type="password"/>'),
pass : $('<input type="password" autocomplete="new-password"/>'),
encoding : $('<input type="text" placeholder="Optional"/>'),
locale : $('<input type="text" placeholder="Optional"/>')
}
Expand Down Expand Up @@ -17805,7 +17805,9 @@ elFinder.prototype.commands.fullscreen = function() {
html.push('</div>');
// end help
},
useDebug = false,
debug = function() {
useDebug = true;
// debug tab
html.push('<div id="'+fm.namespace+'-help-debug" class="ui-tabs-panel ui-widget-content ui-corner-bottom">');
html.push('<div class="ui-widget-content elfinder-help-debug"><ul></ul></div>');
Expand Down Expand Up @@ -17871,7 +17873,14 @@ elFinder.prototype.commands.fullscreen = function() {

fm.one('load', function() {
var parts = self.options.view || ['about', 'shortcuts', 'help', 'debug'],
tabDebug;
tabDebug, i;

// debug tab require jQueryUI Tabs Widget
if (! $.fn.tabs) {
if ((i = $.inArray(parts, 'debug')) !== false) {
parts.splice(i, 1);
}
}

$.each(parts, function(i, title) {
html.push(tab[r](/\{id\}/g, title)[r](/\{title\}/, fm.i18n(title)));
Expand Down Expand Up @@ -17907,22 +17916,24 @@ elFinder.prototype.commands.fullscreen = function() {
.filter(':first').click();

// debug
tabDebug = content.find('.elfinder-help-tab-debug').hide();
debugDIV = content.find('#'+fm.namespace+'-help-debug').children('div:first').tabs();
debugUL = debugDIV.children('ul:first');
if (useDebug) {
tabDebug = content.find('.elfinder-help-tab-debug').hide();
debugDIV = content.find('#'+fm.namespace+'-help-debug').children('div:first').tabs();
debugUL = debugDIV.children('ul:first');

self.debug = {};

fm.bind('backenddebug', function(e) {
// CAUTION: DO NOT TOUCH `e.data`
if (e.data && e.data.debug) {
tabDebug.show();
self.debug = { options : e.data.options, debug : $.extend({ cmd : fm.currentReqCmd }, e.data.debug) };
if (self.dialog/* && self.dialog.is(':visible')*/) {
debugRender();
self.debug = {};

fm.bind('backenddebug', function(e) {
// CAUTION: DO NOT TOUCH `e.data`
if (e.data && e.data.debug) {
tabDebug.show();
self.debug = { options : e.data.options, debug : $.extend({ cmd : fm.currentReqCmd }, e.data.debug) };
if (self.dialog/* && self.dialog.is(':visible')*/) {
debugRender();
}
}
}
});
});
}

content.find('#'+fm.namespace+'-help-about').find('.apiver').text(fm.api);
self.dialog = fm.dialog(content, {title : self.title, width : 530, autoOpen : false, destroyOnClose : false});
Expand Down Expand Up @@ -18519,6 +18530,7 @@ elFinder.prototype.commands.netmount = function() {
},
buttons : {}
},
form = $('<form autocomplete="off"/>'),
hidden = $('<div/>'),
dialog;

Expand Down Expand Up @@ -18601,7 +18613,7 @@ elFinder.prototype.commands.netmount = function() {

content.find('select,input').addClass('elfinder-tabstop');

dialog = fm.dialog(content, opts);
dialog = fm.dialog(form.append(content), opts);
dialogNode = dialog.closest('.ui-dialog');
dialog.ready(function(){
inputs.protocol.change();
Expand Down Expand Up @@ -20623,7 +20635,7 @@ d=(h[l++]|h[l++]<<8|h[l++]<<16|h[l++]<<24)>>>0;(a.length&4294967295)!==d&&n(Erro
.parent().removeClass('ui-state-hover');
fm.options.syncStart = !fm.options.syncStart;
fm.autoSync(fm.options.syncStart? null : 'stop');
}).on('ready', function(){
}).ready(function(){
$(this).parent().toggleClass('ui-state-disabled', !fm.options.syncStart).css('pointer-events', 'auto');
})
};
Expand Down
16 changes: 8 additions & 8 deletions assets/dist/elfinder/js/elfinder.min.js

Large diffs are not rendered by default.

7 changes: 2 additions & 5 deletions assets/dist/scripts/charcoal.admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -5778,7 +5778,7 @@ Charcoal.Admin.Property_Input_SelectPicker.prototype.create_select = function ()
return '<div class="item">' + item.item_render + '</div>';
}
return '<div class="item">' + escape(item[default_opts.labelField]) + '</div>';
}
};
}

if (this.selectize_templates.option) {
Expand All @@ -5787,7 +5787,7 @@ Charcoal.Admin.Property_Input_SelectPicker.prototype.create_select = function ()
return '<div class="option">' + option.option_render + '</div>';
}
return '<div class="option">' + escape(option[default_opts.labelField]) + '</div>';
}
};
}

if (objType) {
Expand Down Expand Up @@ -5845,7 +5845,6 @@ Charcoal.Admin.Property_Input_SelectPicker.prototype.create_select = function ()
var form_ident = this.form_ident;
var submit_label = null;
var id = opts.id || null;
var choice_obj_map = this.choice_obj_map;
var selectize_property_ident = this.selectize_property_ident;
var selectize_obj_type = this.selectize_obj_type;

Expand Down Expand Up @@ -5974,8 +5973,6 @@ Charcoal.Admin.Property_Input_SelectPicker.prototype.create_select = function ()

Selectize.prototype.load_items = function (query, callback) {
var type = this.obj_type;
// var pattern = this.pattern;
var choice_obj_map = this.choice_obj_map;
var selectize_property_ident = this.selectize_property_ident;
var selectize_obj_type = this.selectize_obj_type;

Expand Down
11 changes: 5 additions & 6 deletions assets/dist/scripts/charcoal.admin.min.js

Large diffs are not rendered by default.

31 changes: 17 additions & 14 deletions assets/dist/scripts/charcoal.admin.vendors.js

Large diffs are not rendered by default.

29 changes: 14 additions & 15 deletions assets/dist/scripts/charcoal.admin.vendors.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/dist/scripts/vendors/bb-gmap/gmap.min.js

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions assets/dist/scripts/vendors/tinymce/tinymce.min.js

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions assets/dist/styles/charcoal.admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ td {
background-color: rgba(0, 0, 0, 0.78);
opacity: 0;
visibility: hidden;
-webkit-transition: opacity 0.45s, visibility 0.45s;
transition: opacity 0.45s, visibility 0.45s;
z-index: 98; }

Expand Down Expand Up @@ -223,6 +224,7 @@ td {
-webkit-transform: translateX(calc(-100% - 1px));
-ms-transform: translateX(calc(-100% - 1px));
transform: translateX(calc(-100% - 1px));
-webkit-transition: -webkit-transform 0.3s;
transition: -webkit-transform 0.3s;
transition: transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s;
Expand Down Expand Up @@ -261,6 +263,7 @@ td {
.o-toolbox_icon {
fill: #000000;
height: 2.5rem;
-webkit-transition: fill 0.5s;
transition: fill 0.5s;
width: 1.5625rem; }

Expand Down Expand Up @@ -395,6 +398,7 @@ a.chip:hover, a.chip:focus {
-webkit-transform-origin: center left;
-ms-transform-origin: center left;
transform-origin: center left;
-webkit-transition: opacity 0.3s, -webkit-transform 0.3s;
transition: opacity 0.3s, -webkit-transform 0.3s;
transition: transform 0.3s, opacity 0.3s;
transition: transform 0.3s, opacity 0.3s, -webkit-transform 0.3s; }
Expand Down Expand Up @@ -462,6 +466,7 @@ a.chip:hover, a.chip:focus {
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
-webkit-transition: background-color 0.3s;
transition: background-color 0.3s; }
@media (max-width: 699px) {
.c-header-main_user {
Expand Down Expand Up @@ -494,6 +499,7 @@ a.chip:hover, a.chip:focus {
border-radius: 50%;
margin-bottom: 0.25rem;
display: block;
-webkit-transition: opacity 0.3s, -webkit-transform 0.3s;
transition: opacity 0.3s, -webkit-transform 0.3s;
transition: transform 0.3s, opacity 0.3s;
transition: transform 0.3s, opacity 0.3s, -webkit-transform 0.3s;
Expand Down Expand Up @@ -655,6 +661,7 @@ a.chip:hover, a.chip:focus {
-ms-flex-align: center;
align-items: center;
height: 3.6875rem;
-webkit-transition: background-color 0.3s;
transition: background-color 0.3s;
border-top-width: 1px;
border-top-style: solid; }
Expand Down Expand Up @@ -699,6 +706,7 @@ a.chip:hover, a.chip:focus {
text-decoration: none; }
.panel-heading .c-nav_list_link {
color: #262626;
-webkit-transition: color 0.2s;
transition: color 0.2s; }
.panel-heading .c-nav_list_link:hover {
color: #3498db; }
Expand All @@ -712,6 +720,7 @@ a.chip:hover, a.chip:focus {
display: inline-block;
padding: 0.1875rem 0.625rem;
border-radius: 2px;
-webkit-transition: background-color 0.3s;
transition: background-color 0.3s;
max-width: 100%;
word-wrap: normal;
Expand Down Expand Up @@ -755,12 +764,14 @@ a.chip:hover, a.chip:focus {
border-radius: 2px;
background-color: #ffffff;
margin: 0 0.625rem;
-webkit-transition: background-color 0.3s;
transition: background-color 0.3s; }
.c-nav_list_link_plus::before, .c-nav_list_link_plus::after {
content: "";
display: inline-block;
position: absolute;
background-color: #1a252d;
-webkit-transition: background-color 0.3s, opacity 0.3s;
transition: background-color 0.3s, opacity 0.3s; }
.c-nav_list_link_plus::before {
top: 50%;
Expand Down Expand Up @@ -810,6 +821,7 @@ a.chip:hover, a.chip:focus {
overflow-y: auto;
-webkit-overflow-scrolling: touch;
z-index: 999;
-webkit-transition: -webkit-transform 0.2s;
transition: -webkit-transform 0.2s;
transition: transform 0.2s;
transition: transform 0.2s, -webkit-transform 0.2s; }
Expand Down Expand Up @@ -847,6 +859,7 @@ a.chip:hover, a.chip:focus {
-webkit-box-pack: center;
-ms-flex-pack: center;
justify-content: center;
-webkit-transition: background-color 0.3s, color 0.3s;
transition: background-color 0.3s, color 0.3s; }
.c-nav-main_link:focus {
color: #ffffff; }
Expand All @@ -867,6 +880,7 @@ a.chip:hover, a.chip:focus {
-webkit-transform: translateX(0);
-ms-transform: translateX(0);
transform: translateX(0);
-webkit-transition: -webkit-transform 0.3s;
transition: -webkit-transform 0.3s;
transition: transform 0.3s;
transition: transform 0.3s, -webkit-transform 0.3s; }
Expand Down Expand Up @@ -944,6 +958,7 @@ a.chip:hover, a.chip:focus {
-webkit-transform: translateX(-100%);
-ms-transform: translateX(-100%);
transform: translateX(-100%);
-webkit-transition: -webkit-transform 0.5s;
transition: -webkit-transform 0.5s;
transition: transform 0.5s;
transition: transform 0.5s, -webkit-transform 0.5s; }
Expand All @@ -967,6 +982,7 @@ a.chip:hover, a.chip:focus {
-webkit-transform: translateX(100%);
-ms-transform: translateX(100%);
transform: translateX(100%);
-webkit-transition: -webkit-transform 0.45s;
transition: -webkit-transform 0.45s;
transition: transform 0.45s;
transition: transform 0.45s, -webkit-transform 0.45s;
Expand Down Expand Up @@ -1152,6 +1168,7 @@ ul.c-panel_table {
-ms-flex-pack: center;
justify-content: center;
font-size: 0.8125rem;
-webkit-transition: color 0.3s;
transition: color 0.3s; }
.c-panel_footer_item:hover.-red {
color: #ed5564; }
Expand Down Expand Up @@ -1205,6 +1222,7 @@ ul.c-panel_table {
vertical-align: middle;
width: 2.8125rem; }
.c-audio-player_button.-record {
background: -webkit-linear-gradient(bottom, #f1f1f1, #ffffff);
background: linear-gradient(to top, #f1f1f1, #ffffff);
border: 1px solid #d7d7d7;
font-size: 1.875rem;
Expand Down Expand Up @@ -1618,6 +1636,7 @@ ul.c-panel_table {
-webkit-transform: translateX(-50%);
-ms-transform: translateX(-50%);
transform: translateX(-50%);
-webkit-transition: opacity 0.1s ease-out, top 0.15s ease-out;
transition: opacity 0.1s ease-out, top 0.15s ease-out;
white-space: nowrap;
background-color: #3498db;
Expand Down Expand Up @@ -1728,6 +1747,7 @@ textarea.form-control {

.btn {
font-size: 0.8125rem;
-webkit-transition: background-color 0.3s;
transition: background-color 0.3s; }
.btn.btn-lg {
font-size: 1rem; }
Expand Down

0 comments on commit 6d4af12

Please sign in to comment.