Skip to content

Commit

Permalink
Rebuild files for beta deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
jlukic committed Oct 13, 2014
1 parent 4754fa9 commit 37c6cab
Show file tree
Hide file tree
Showing 106 changed files with 11,755 additions and 753 deletions.
1 change: 1 addition & 0 deletions RELEASE NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- **Form** - Date field has been removed, use a ``ui icon input`` with a ``calendar icon`` instead
- **Label** - Corner labels no longer support text, only icons.
- **Form** - Standard grids now have gutters on left and right of first and last column. ``ui fitted grid`` can be used to remove these margins
- **Dropdown** - Sub menus inside dropdowns now need a wrapping div **text** around sub-menu descriptions
- **Header** - Headers now do not automatically resize based on h1-h6
- **Checkbox** - Checkbox "enable" and "disable" have been replaced with "check" and "uncheck"
- **Modal** - Modal ``left`` and ``right`` sections are now replaced with ``image`` and ``description``
Expand Down
100 changes: 56 additions & 44 deletions build/less/definitions/behaviors/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@ $.api = $.fn.api = function(parameters) {
return;
}
// determine if an api event already occurred
if(module.is.loading() && !settings.allowMultiple) {
module.debug('Request cancelled previous request is still pending');
if(module.is.loading() && settings.throttle === 0 ) {
module.debug('Cancelling request, previous request is still pending');
return;
}

Expand All @@ -124,7 +124,7 @@ $.api = $.fn.api = function(parameters) {
}

// Add form content
if(settings.serializeForm !== false || $module.is('form')) {
if(settings.serializeForm !== false || $context.is('form')) {
if(settings.serializeForm == 'json') {
$.extend(true, settings.data, module.get.formData());
}
Expand Down Expand Up @@ -181,9 +181,17 @@ $.api = $.fn.api = function(parameters) {

module.verbose('Creating AJAX request with settings', ajaxSettings);

// request provides a wrapper around xhr
module.request = module.create.request();
module.xhr = module.create.xhr();
if( !module.is.loading() ) {
module.request = module.create.request();
module.xhr = module.create.xhr();
}
else {
// throttle additional requests
module.timer = setTimeout(function() {
module.request = module.create.request();
module.xhr = module.create.xhr();
}, settings.throttle);
}

},

Expand Down Expand Up @@ -393,10 +401,10 @@ $.api = $.fn.api = function(parameters) {
setTimeout(module.remove.error, settings.errorDuration);
}
module.debug('API Request error:', errorMessage);
$.proxy(settings.onFailure, context)(errorMessage, $module);
$.proxy(settings.onError, context)(errorMessage, context);
}
else {
$.proxy(settings.onAbort, context)(errorMessage, $module);
$.proxy(settings.onAbort, context)(errorMessage, context);
module.debug('Request Aborted (Most likely caused by page change or CORS Policy)', status, httpMessage);
}
}
Expand Down Expand Up @@ -455,22 +463,30 @@ $.api = $.fn.api = function(parameters) {
runSettings
;
runSettings = $.proxy(settings.beforeSend, $module)(settings);
if(runSettings.success !== undefined) {
module.debug('Legacy success callback detected', runSettings);
module.error(error.legacyParameters);
runSettings.onSuccess = runSettings.success;
}
if(runSettings.failure !== undefined) {
module.debug('Legacy failure callback detected', runSettings);
module.error(error.legacyParameters);
runSettings.onFailure = runSettings.failure;
if(runSettings) {
if(runSettings.success !== undefined) {
module.debug('Legacy success callback detected', runSettings);
module.error(error.legacyParameters);
runSettings.onSuccess = runSettings.success;
}
if(runSettings.failure !== undefined) {
module.debug('Legacy failure callback detected', runSettings);
module.error(error.legacyParameters);
runSettings.onFailure = runSettings.failure;
}
if(runSettings.complete !== undefined) {
module.debug('Legacy complete callback detected', runSettings);
module.error(error.legacyParameters);
runSettings.onComplete = runSettings.complete;
}
}
if(runSettings.complete !== undefined) {
module.debug('Legacy complete callback detected', runSettings);
module.error(error.legacyParameters);
runSettings.onComplete = runSettings.complete;
if(runSettings === undefined) {
module.error(error.noReturnedValue);
}
return runSettings;
return (runSettings !== undefined)
? runSettings
: settings
;
},
defaultData: function() {
var
Expand Down Expand Up @@ -518,17 +534,14 @@ $.api = $.fn.api = function(parameters) {
var
formData
;
if(settings.serializeForm == 'json') {
if($(this).toJSON === undefined ) {
module.error(error.missingSerialize);
return;
}
formData = $form.toJSON();
if($(this).serializeObject() !== undefined) {
formData = $form.serializeObject();
}
else {
module.error(error.missingSerialize);
formData = $form.serialize();
}
module.debug('Retrieving form data', formData);
module.debug('Retrieved form data', formData);
return formData;
},
templateURL: function(action) {
Expand Down Expand Up @@ -620,7 +633,7 @@ $.api = $.fn.api = function(parameters) {
performance.push({
'Name' : message[0],
'Arguments' : [].slice.call(message, 1) || '',
'Element' : element,
//'Element' : element,
'Execution Time' : executionTime
});
}
Expand Down Expand Up @@ -745,31 +758,23 @@ $.api.settings = {
// event binding
on : 'auto',
filter : '.disabled',
context : false,
stateContext : false,

// state
loadingDuration : 0,
errorDuration : 2000,

// templating
action : false,
url : false,

regExp : {
required: /\{\$*[A-z0-9]+\}/g,
optional: /\{\/\$*[A-z0-9]+\}/g,
},

// data
urlData : {},


// ui
defaultData : true,
serializeForm : false,
throttle : 100,
allowMultiple : false,

// state
loadingDuration : 0,
errorDuration : 2000,
throttle : 0,

// jQ ajax
method : 'get',
Expand All @@ -783,6 +788,7 @@ $.api.settings = {
onSuccess : function(response, $module) {},
onComplete : function(response, $module) {},
onFailure : function(errorMessage, $module) {},
onError : function(errorMessage, $module) {},
onAbort : function(errorMessage, $module) {},

successTest : false,
Expand All @@ -795,14 +801,20 @@ $.api.settings = {
JSONParse : 'JSON could not be parsed during error handling',
legacyParameters : 'You are using legacy API success callback names',
missingAction : 'API action used but no url was defined',
missingSerialize : 'Serializing a Form requires toJSON to be included',
missingSerialize : 'Required dependency jquery-serialize-object missing, using basic serialize',
missingURL : 'No URL specified for api event',
noReturnedValue : 'The beforeSend callback must return a settings object, beforeSend ignored.',
parseError : 'There was an error parsing your request',
requiredParameter : 'Missing a required URL parameter: ',
statusMessage : 'Server gave an error: ',
timeout : 'Your request timed out'
},

regExp : {
required: /\{\$*[A-z0-9]+\}/g,
optional: /\{\/\$*[A-z0-9]+\}/g,
},

className: {
loading : 'loading',
error : 'error'
Expand Down
1 change: 1 addition & 0 deletions build/less/definitions/collections/form.less
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
.ui.form input[type="tel"],
.ui.form .ui.input {
width: 100%;
vertical-align: top;
}

.ui.form input[type="text"],
Expand Down
23 changes: 19 additions & 4 deletions build/less/definitions/collections/grid.less
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,13 @@
table-layout: fixed;
width: @tableWidth;
}
.ui[class*="equal height"].relaxed.grid {
width: @relaxedTableWidth;
}
.ui[class*="equal height"][class*="very relaxed"].grid {
width: @veryRelaxedTableWidth;
}

.ui[class*="equal height"].grid > .row,
.ui[class*="equal height"].row {
display: table;
Expand Down Expand Up @@ -1066,9 +1073,13 @@
@media only screen and (max-width: @largestMobileScreen) {
.ui.stackable.grid {
display: block !important;
width: 100%;
width: auto;
padding: 0em;
margin: 0em !important;
margin-top: 0em;
margin-bottom: 0em;
}
:not(.column) > .ui.stackable.grid {
margin: 0em;
}
.ui.stackable.grid > .row > .wide.column,
.ui.stackable.grid > .wide.column,
Expand All @@ -1079,16 +1090,20 @@
display: block !important;
width: auto !important;

margin: (@stackableRowSpacing / 2) 0em 0em !important;
padding: (@stackableRowSpacing / 2) (@stackableGutter / 2) 0em !important;
margin: (@stackableRowSpacing / 4) 0em !important;
padding: (@stackableRowSpacing / 4) (@stackableGutter / 2) 0em !important;

box-shadow: none !important;
}

.ui.stackable.celled.grid > .column,
.ui.stackable.celled.grid > .row > .column,
.ui.stackable.divided.grid > .column,
.ui.stackable.divided.grid > .row > .column {
border-top: @stackableMobileBorder;
box-shadow: none !important;
margin: (@stackableRowSpacing) 0em !important;
padding: (@stackableRowSpacing) (@stackableGutter / 2) 0em !important;
}
.ui.inverted.stackable.celled.grid > .column,
.ui.inverted.stackable.celled.grid > .row > .column,
Expand Down
1 change: 1 addition & 0 deletions build/less/definitions/elements/button.less
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,7 @@
.ui.basic.buttons .button.active,
.ui.basic.button.active {
background: @basicActiveBackground !important;
box-shadow: @basicActiveBoxShadow !important;
color: @basicActiveColor;
box-shadow: @selectedBorderColor;
}
Expand Down
32 changes: 23 additions & 9 deletions build/less/definitions/modules/dropdown.less
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@
Item Image
---------------*/

.ui.dropdown .text > img,
.ui.dropdown .text > .image,
.ui.dropdown > .text > img,
.ui.dropdown > .text > .image,
.ui.dropdown .menu > .item > .image,
.ui.dropdown .menu > .item > img {
display: inline-block;
Expand Down Expand Up @@ -199,17 +199,21 @@

/* Icons / Flags / Labels */
.ui.dropdown > .text > .icon,
.ui.dropdown .menu > .item .icon {
.ui.dropdown .menu > .item > .icon {
margin: @itemIconMargin;
}
.ui.dropdown > .text > .label,
.ui.dropdown .menu > .item .label {
.ui.dropdown .menu > .item > .label {
margin: @itemLabelMargin;
}
.ui.dropdown > .text > .flag,
.ui.dropdown .menu > .item .flag {
.ui.dropdown .menu > .item > .flag {
margin: @itemFlagMargin;
}
.ui.dropdown .menu > .item > .icon + .text {
display: block;
margin-right: @dropdownSubMenuIconDistance;
}


/* Remove Menu Item Divider */
Expand All @@ -227,6 +231,11 @@
.ui.dropdown.icon.button > .dropdown.icon {
margin: 0em;
}
.ui.dropdown.button:not(.pointing):not(.floating).active,
.ui.dropdown.button:not(.pointing):not(.floating).visible {
border-bottom-left-radius: 0em;
border-bottom-right-radius: 0em;
}

/* Automatically float dropdown menu right on last menu item */
.ui.menu .right.menu .dropdown:last-child .menu,
Expand Down Expand Up @@ -289,6 +298,11 @@ select.ui.dropdown {
transition: @selectionIconTransition;
}

/* Compact */
.ui.compact.selection.dropdown {
min-width: 0px;
}

/* Remove Selection */
.ui.selection.dropdown > .delete.icon {
opacity: 0.6;
Expand Down Expand Up @@ -397,8 +411,8 @@ select.ui.dropdown {
}

/* Active Item */
.ui.selection.active.dropdown .text:not(.default),
.ui.selection.visible.dropdown .text:not(.default) {
.ui.selection.active.dropdown > .text:not(.default),
.ui.selection.visible.dropdown > .text:not(.default) {
font-weight: @selectionVisibleTextFontWeight;
color: @selectionVisibleTextColor;
}
Expand All @@ -424,7 +438,7 @@ select.ui.dropdown {
margin: @inlineIconMargin;
vertical-align: top;
}
.ui.inline.dropdown .text {
.ui.inline.dropdown > .text {
font-weight: @inlineTextFontWeight;
}
.ui.inline.dropdown .menu {
Expand Down Expand Up @@ -494,7 +508,7 @@ select.ui.dropdown {
----------------------*/

/* Filtered Item */
.ui.dropdown .filtered.text {
.ui.dropdown > .filtered.text {
visibility: hidden;
}
.ui.dropdown .filtered.item {
Expand Down
2 changes: 1 addition & 1 deletion build/less/definitions/modules/transition.less
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@

/* Visible */
.visible.transition {
display: block;
display: block !important;
visibility: visible !important;
backface-visibility: @backfaceVisibility;
transform: @use3DAcceleration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

@gutterWidth: 2rem;
@rowSpacing: 2rem;
@tableWidth: ~"calc(100% + "@gutterWidth~")";

@columnMaxImageWidth: 100%;
@tableWidth: ~"calc(100% + "@gutterWidth~")";

/*******************************
Variations
Expand Down Expand Up @@ -53,6 +53,10 @@
@relaxedGutterWidth: 3rem;
@veryRelaxedGutterWidth: 5rem;

@relaxedTableWidth: ~"calc(100% + "@relaxedGutterWidth~")";
@veryRelaxedTableWidth: ~"calc(100% + "@veryRelaxedGutterWidth~")";


/*--------------
Divided
---------------*/
Expand Down
Loading

0 comments on commit 37c6cab

Please sign in to comment.