Browse Source

Updates to many UI components from subrepo

pull/912/head
jlukic 11 years ago
parent
commit
f951e2140c
55 changed files with 166 additions and 101 deletions
  1. 23
      src/definitions/behaviors/api.js
  2. 0
      src/definitions/behaviors/colorize.js
  3. 17
      src/definitions/behaviors/form.js
  4. 0
      src/definitions/behaviors/state.js
  5. 24
      src/definitions/behaviors/visit.js
  6. 0
      src/definitions/collections/breadcrumb.less
  7. 5
      src/definitions/collections/form.less
  8. 61
      src/definitions/collections/grid.less
  9. 0
      src/definitions/collections/menu.less
  10. 3
      src/definitions/collections/message.less
  11. 0
      src/definitions/collections/table.less
  12. 4
      src/definitions/elements/button.less
  13. 0
      src/definitions/elements/divider.less
  14. 1
      src/definitions/elements/header.less
  15. 1
      src/definitions/elements/icon.less
  16. 11
      src/definitions/elements/image.less
  17. 2
      src/definitions/elements/input.less
  18. 0
      src/definitions/elements/label.less
  19. 0
      src/definitions/elements/progress.less
  20. 0
      src/definitions/elements/reveal.less
  21. 0
      src/definitions/globals/reset.less
  22. 9
      src/definitions/globals/site.js
  23. 0
      src/definitions/globals/site.less
  24. 2
      src/definitions/modules/accordion.js
  25. 3
      src/definitions/modules/chatroom.js
  26. 0
      src/definitions/modules/chatroom.less
  27. 2
      src/definitions/modules/dimmer.js
  28. 0
      src/definitions/modules/dimmer.less
  29. 2
      src/definitions/modules/dropdown.js
  30. 7
      src/definitions/modules/dropdown.less
  31. 2
      src/definitions/modules/modal.js
  32. 0
      src/definitions/modules/modal.less
  33. 2
      src/definitions/modules/nag.js
  34. 0
      src/definitions/modules/nag.less
  35. 33
      src/definitions/modules/popup.js
  36. 1
      src/definitions/modules/popup.less
  37. 2
      src/definitions/modules/rating.js
  38. 21
      src/definitions/modules/rating.less
  39. 2
      src/definitions/modules/search.js
  40. 0
      src/definitions/modules/search.less
  41. 2
      src/definitions/modules/shape.js
  42. 0
      src/definitions/modules/shape.less
  43. 2
      src/definitions/modules/sidebar.js
  44. 0
      src/definitions/modules/sidebar.less
  45. 0
      src/definitions/modules/sticky.less
  46. 4
      src/definitions/modules/tab.js
  47. 0
      src/definitions/modules/tab.less
  48. 2
      src/definitions/modules/transition.less
  49. 2
      src/definitions/modules/video.js
  50. 0
      src/definitions/modules/video.less
  51. 0
      src/definitions/views/comment.less
  52. 0
      src/definitions/views/feed.less
  53. 0
      src/definitions/views/item.less
  54. 15
      src/definitions/views/list.less
  55. 0
      src/definitions/views/statistic.less

23
src/definitions/behaviors/api.js

@ -75,7 +75,7 @@ $.api = $.fn.api = function(parameters) {
if( triggerEvent ) {
module.debug('Attaching API events to element', triggerEvent);
$module
.on(triggerEvent + eventNamespace, module.query)
.on(triggerEvent + eventNamespace, module.event.trigger)
;
}
else {
@ -119,8 +119,13 @@ $.api = $.fn.api = function(parameters) {
}
// Add form content
if(settings.serializeForm) {
$.extend(true, settings.data, module.get.formData());
if(settings.serializeForm !== false || $module.is('form') && settings.method == 'POST') {
if(settings.serializeForm == 'json') {
$.extend(true, settings.data, module.get.formData());
}
else {
settings.data = module.get.formData();
}
}
// call beforesend and get any settings changes
@ -238,6 +243,12 @@ $.api = $.fn.api = function(parameters) {
},
event: {
trigger: function(event) {
module.query();
if(event.type == 'submit' || event.type == 'click') {
event.preventDefault();
}
},
xhr: {
always: function() {
// calculate if loading time was below minimum threshold
@ -401,6 +412,9 @@ $.api = $.fn.api = function(parameters) {
if( !$.isWindow(element) ) {
if( $module.is('input') ) {
data.value = $module.val();
}
else if( $module.is('form') ) {
}
else {
data.text = $module.text();
@ -422,6 +436,9 @@ $.api = $.fn.api = function(parameters) {
: 'keyup'
;
}
else if( $module.is('form') ) {
return 'submit';
}
else {
return 'click';
}

0
src/definitions/behaviors/colorize.js

17
src/definitions/behaviors/form.js

@ -90,7 +90,18 @@ $.fn.form = function(fields, parameters) {
;
},
attachEvents: function(selector, action) {
action = action || 'submit';
$(selector)
.on('click', function(event) {
module[action]();
event.preventDefault();
})
;
},
bindEvents: function() {
if(settings.keyboardShortcuts) {
$field
.on('keydown' + eventNamespace, module.event.field.keydown)
@ -102,9 +113,9 @@ $.fn.form = function(fields, parameters) {
$field
.on('blur' + eventNamespace, module.event.field.blur)
;
$submit
.on('click' + eventNamespace, module.submit)
;
// attach submit events
module.attachEvents($submit, 'submit');
$field
.each(function() {
var

0
src/definitions/behaviors/state.js

24
src/definitions/behaviors/visit.js

@ -13,7 +13,9 @@
$.visit = $.fn.visit = function(parameters) {
var
$allModules = $(this),
$allModules = $.isFunction(this)
? $(window)
: $(this),
moduleSelector = $allModules.selector || '',
time = new Date().getTime(),
@ -24,7 +26,7 @@ $.visit = $.fn.visit = function(parameters) {
queryArguments = [].slice.call(arguments, 1),
returnedValue
;
$(this)
$allModules
.each(function() {
var
settings = $.extend(true, {}, $.fn.visit.settings, parameters),
@ -153,6 +155,15 @@ $.visit = $.fn.visit = function(parameters) {
},
set: {
count: function(value) {
module.store(settings.key.count, value);
},
ids: function(value) {
module.store(settings.key.ids, value);
}
},
reset: function() {
module.store(settings.key.count, 0);
module.store(settings.key.ids, '');
@ -182,9 +193,12 @@ $.visit = $.fn.visit = function(parameters) {
var
$element = $(selector)
;
if($element.size() > 0) {
if($element.size() > 0 && !$.isWindow($element[0])) {
module.debug('Updating visit count for element', $element);
$displays = $displays.add($element);
$displays = ($displays.size() > 0)
? $displays.add($element)
: $element
;
}
module.update.display();
}
@ -448,7 +462,7 @@ $.fn.visit.settings = {
name : 'Visit',
debug : true,
debug : false,
verbose : true,
performance : true,

0
src/definitions/collections/breadcrumb.less

5
src/definitions/collections/form.less

@ -420,6 +420,8 @@
Required Field
---------------------*/
.ui.form .required.fields > .field > label:after,
.ui.form .required.fields > .field > .checkbox:after,
.ui.form .required.field > label:after,
.ui.form .required.field > .checkbox:after {
margin: -0.2em 0em 0em 0.2em;
@ -473,8 +475,7 @@
.ui.form .grouped.fields {
margin: 0em 0em 1em;
}
.ui.form .grouped.fields .field,
.ui.form .grouped.inline.fields .field {
.ui.form .grouped.fields .field {
display: block;
float: none;
margin: 0.5em 0em;

61
src/definitions/collections/grid.less

@ -34,6 +34,11 @@
box-sizing: border-box;
}
body > .ui.grid {
margin-left: 0% !important;
margin-right: 0% !important;
}
.ui.grid:after,
.ui.row:after {
content: ".";
@ -346,29 +351,33 @@
width: @oneColumn;
}
/*----------------------
Centered
-----------------------*/
.ui.centered.grid,
.ui.centered.grid > .row,
.ui.grid .centered.row {
text-align: center;
}
/*----------------------
Relaxed
-----------------------*/
.ui.relaxed.grid > .column,
.ui.relaxed.grid > .column:not(.row),
.ui.relaxed.grid > .row > .column {
padding-left: @relaxedGutterWidth;
padding-right: @relaxedGutterWidth;
}
.ui.very.relaxed.grid > .column,
.ui.very.relaxed.grid > .column:not(.row),
.ui.very.relaxed.grid > .row > .column {
padding-left: @veryRelaxedGutterWidth;
padding-right: @veryRelaxedGutterWidth;
}
.ui.vertically.divided.grid > .row:before {
margin-left: @relaxedGutterWidth;
margin-right: @relaxedGutterWidth;
}
/*----------------------
Fitted
-----------------------*/
@ -377,15 +386,13 @@
margin-left: -@gutterWidth;
margin-right: -@gutterWidth;
}
.ui.relaxed.fitted.grid {
margin-left: -@relaxedGutterWidth;
margin-right: -@relaxedGutterWidth;
}
.ui.vertically.divided.fitted.grid > .row:before {
margin-left: 0%;
margin-right: 0%;
.ui.very.relaxed.fitted.grid {
margin-left: -@veryRelaxedGutterWidth;
margin-right: -@veryRelaxedGutterWidth;
}
@ -405,14 +412,8 @@
Divided
-----------------------*/
.ui.divided.grid:not(.vertically),
.ui.divided.grid:not(.vertically) > .row {
display: table;
max-width: 100%;
}
.ui.divided.grid:not(.vertically) > .column:not(.row),
.ui.divided.grid:not(.vertically) > .row > .column {
display: table-cell;
box-shadow: @dividedBorder;
}
.ui.divided.grid:not(.vertically) > .column.row {
@ -425,11 +426,7 @@
}
/* Divided Row */
.ui.grid > .divided.row {
display: table;
}
.ui.grid > .divided.row > .column {
display: table-cell;
box-shadow: @dividedBorder;
}
.ui.grid > .divided.row > .column:first-child {
@ -446,7 +443,7 @@
top: 0px;
left: 0px;
width: 100%;
width: (100% - (@gutterWidth * 2));
height: 1px;
margin: 0% @gutterWidth;
@ -464,6 +461,24 @@
box-shadow: @verticallyDividedInvertedBorder;
}
/* Relaxed */
.ui.relaxed.vertically.divided.grid > .row:before {
margin-left: @relaxedGutterWidth;
margin-right: @relaxedGutterWidth;
width: (100% - (@relaxedGutterWidth * 2));
}
.ui.very.relaxed.vertically.divided.grid > .row:before {
margin-left: @veryRelaxedGutterWidth;
margin-right: @veryRelaxedGutterWidth;
width: (100% - (@veryRelaxedGutterWidth * 2));
}
/* Fitted */
.ui.vertically.divided.fitted.grid > .row:before {
margin-left: 0%;
margin-right: 0%;
}
/*----------------------
Celled

0
src/definitions/collections/menu.less

3
src/definitions/collections/message.less

@ -80,8 +80,7 @@
/* block with headers */
.ui.message .header {
margin: 0em;
font-size: 1.33em;
font-size: 1.1em;
font-weight: bold;
}

0
src/definitions/collections/table.less

4
src/definitions/elements/button.less

@ -82,7 +82,6 @@
.ui.button:focus {
background-color: @focusBackgroundColor;
background-image: @focusBackgroundImage;
box-shadow: @focusBoxShadow;
color: @selectedTextColor;
}
@ -552,7 +551,7 @@
}
.ui.compact.icon.buttons .button,
.ui.compact.buttons .icon.button {
padding: @compactVerticalPadding @compactVerticalPadding ( @compactHorizontalPadding + @shadowOffset );
padding: @compactVerticalPadding @compactVerticalPadding ( @compactVerticalPadding + @shadowOffset );
}
/*-------------------
@ -872,7 +871,6 @@
width: @orWidth;
height: @orHeight;
z-index: 3;
text-shadow: none;
}
.ui.buttons .or:before {
position: absolute;

0
src/definitions/elements/divider.less

1
src/definitions/elements/header.less

@ -303,6 +303,7 @@ h5.ui.header {
.ui.right.aligned.header {
text-align: right;
}
.ui.centered.header,
.ui.center.aligned.header {
text-align: center;
}

1
src/definitions/elements/icon.less

@ -71,6 +71,7 @@ i.icon {
speak: none;
box-sizing: border-box;
font-smoothing: antialiased;
backface-visibility: hidden;
}
/*******************************

11
src/definitions/elements/image.less

@ -9,9 +9,6 @@
*
*/
/*******************************
Theme
*******************************/
@ -21,7 +18,6 @@
@import '../../semantic.config';
/*******************************
Image
*******************************/
@ -128,11 +124,18 @@ img.ui.image {
.ui.right.floated.images,
.ui.right.floated.image {
float: right;
margin-right: 0em;
margin-bottom: @floatedVerticalMargin;
margin-left: @floatedHorizontalMargin;
}
.ui.centered.images,
.ui.centered.image {
margin-left: auto;
margin-right: auto;
}
/*--------------
Sizes
---------------*/

2
src/definitions/elements/input.less

@ -218,7 +218,7 @@
top: @borderWidth;
right: @borderWidth;
font-size: @labelSize;
border-radius: 0em @borderRadius;
border-top-right-radius: @borderRadius;
}
.ui.labeled.input input {
padding-right: @labeledMargin !important;

0
src/definitions/elements/label.less

0
src/definitions/elements/progress.less

0
src/definitions/elements/reveal.less

0
src/definitions/globals/reset.less

9
src/definitions/globals/site.js

@ -428,17 +428,14 @@ $.site.settings = {
namespace : 'site',
error : {
console : 'Console cannot be restored, most likely it was overwritten outside of module'
console : 'Console cannot be restored, most likely it was overwritten outside of module',
method : 'The method you called is not defined.'
},
debug : false,
verbose : true,
debug : true,
performance : true,
error: {
method : 'The method you called is not defined.'
},
modules: [
'accordion',
'api',

0
src/definitions/globals/site.less

2
src/definitions/modules/accordion.js

@ -387,7 +387,7 @@ $.fn.accordion.settings = {
name : 'Accordion',
namespace : 'accordion',
debug : true,
debug : false,
verbose : true,
performance : true,

3
src/definitions/modules/chatroom.js

@ -598,9 +598,10 @@ $.fn.chatroom = function(parameters) {
$.fn.chatroom.settings = {
name : 'Chat',
debug : false,
namespace : 'chat',
debug : false,
channel : 'present-chat',
onJoin : function(){},

0
src/definitions/modules/chatroom.less

2
src/definitions/modules/dimmer.js

@ -544,7 +544,7 @@ $.fn.dimmer.settings = {
name : 'Dimmer',
namespace : 'dimmer',
debug : true,
debug : false,
verbose : true,
performance : true,

0
src/definitions/modules/dimmer.less

2
src/definitions/modules/dropdown.js

@ -910,8 +910,8 @@ $.fn.dropdown.settings = {
name : 'Dropdown',
namespace : 'dropdown',
debug : false,
verbose : true,
debug : true,
performance : true,
on : 'click',

7
src/definitions/modules/dropdown.less

@ -145,6 +145,7 @@
border: none;
height: auto;
border-top: 1px solid rgba(0, 0, 0, 0.1);
font-size: 0.875em;
display: block;
color: rgba(0, 0, 0, 0.75);
@ -216,7 +217,6 @@
font-weight: bold;
border-left: none;
background-color: rgba(0, 0, 0, 0.03);
border-color: transparent !important;
-webkit-box-shadow: none;
-moz-shadow: none;
@ -493,6 +493,11 @@
margin-top: 0.5em !important;
box-shadow:
0px 0px 0px 1px rgba(0, 0, 0, 0.2) inset,
0px 2px 5px 0px rgba(0, 0, 0, 0.15)
;
-webkit-border-radius: 0.325em;
-moz-border-radius: 0.325em;
border-radius: 0.325em;

2
src/definitions/modules/modal.js

@ -699,7 +699,7 @@ $.fn.modal.settings = {
name : 'Modal',
namespace : 'modal',
debug : true,
debug : false,
verbose : true,
performance : true,

0
src/definitions/modules/modal.less

2
src/definitions/modules/nag.js

@ -483,8 +483,8 @@ $.fn.nag.settings = {
name : 'Nag',
debug : false,
verbose : true,
debug : true,
performance : true,
namespace : 'Nag',

0
src/definitions/modules/nag.less

33
src/definitions/modules/popup.js

@ -124,17 +124,30 @@ $.fn.popup = function(parameters) {
event: {
start: function(event) {
module.timer = setTimeout(function() {
var
delay = ($.isPlainObject(settings.delay))
? settings.delay.show
: settings.delay
;
clearTimeout(module.hideTimer);
module.showTimer = setTimeout(function() {
if( module.is.hidden() ) {
module.show();
}
}, settings.delay);
}, delay);
},
end: function() {
clearTimeout(module.timer);
if( module.is.visible() ) {
module.hide();
}
var
delay = ($.isPlainObject(settings.delay))
? settings.delay.hide
: settings.delay
;
clearTimeout(module.showTimer);
module.hideTimer = setTimeout(function() {
if( module.is.visible() ) {
module.hide();
}
}, delay);
},
resize: function() {
if( module.is.visible() ) {
@ -788,7 +801,8 @@ $.fn.popup = function(parameters) {
$.fn.popup.settings = {
name : 'Popup',
debug : false,
debug : true,
verbose : true,
performance : true,
namespace : 'popup',
@ -808,7 +822,10 @@ $.fn.popup.settings = {
context : 'body',
position : 'top center',
delay : 150,
delay : {
show : 300,
hide : 150
},
inline : false,
preserve : false,

1
src/definitions/modules/popup.less

@ -206,6 +206,7 @@
.ui.loading.popup {
display: block;
visibility: hidden;
z-index: -1;
}
.ui.animating.popup,

2
src/definitions/modules/rating.js

@ -374,8 +374,8 @@ $.fn.rating.settings = {
name : 'Rating',
namespace : 'rating',
verbose : true,
debug : true,
verbose : true,
performance : true,
initialRating : 0,

21
src/definitions/modules/rating.less

@ -48,27 +48,6 @@
}
.ui.rating .icon:before {
content: "\2605";
-webkit-transition:
color 0.3s ease,
opacity 0.3s ease
;
-moz-transition:
color 0.3s ease,
opacity 0.3s ease
;
-ms-transition:
color 0.3s ease,
opacity 0.3s ease
;
-o-transition:
color 0.3s ease,
opacity 0.3s ease
;
transition:
color 0.3s ease,
opacity 0.3s ease
;
}
/*******************************

2
src/definitions/modules/search.js

@ -604,7 +604,7 @@ $.fn.search.settings = {
name : 'Search Module',
namespace : 'search',
debug : true,
debug : false,
verbose : true,
performance : true,

0
src/definitions/modules/search.less

2
src/definitions/modules/shape.js

@ -744,7 +744,7 @@ $.fn.shape.settings = {
name : 'Shape',
// debug content outputted to console
debug : true,
debug : false,
// verbose debug output
verbose : true,

0
src/definitions/modules/shape.less

2
src/definitions/modules/sidebar.js

@ -479,8 +479,8 @@ $.fn.sidebar.settings = {
name : 'Sidebar',
namespace : 'sidebar',
debug : false,
verbose : true,
debug : true,
performance : true,
useCSS : true,

0
src/definitions/modules/sidebar.less

0
src/definitions/modules/sticky.less

4
src/definitions/modules/tab.js

@ -665,7 +665,7 @@ $.fn.tab.settings = {
namespace : 'tab',
verbose : true,
debug : true,
debug : false,
performance : true,
// only called first time a tab's content is loaded (when remote source)
@ -684,7 +684,7 @@ $.fn.tab.settings = {
historyType : 'hash',
path : false,
context : 'body',
context : false,
// max depth a tab can be nested
maxDepth : 25,

0
src/definitions/modules/tab.less

2
src/definitions/modules/transition.less

@ -47,6 +47,8 @@
.ui.visible.transition {
display: block !important;
visibility: visible;
transform: rotateZ(0deg);
backface-visibility: hidden;
}
/* Disabled */

2
src/definitions/modules/video.js

@ -413,7 +413,7 @@ $.fn.video.settings = {
name : 'Video',
namespace : 'video',
debug : true,
debug : false,
verbose : true,
performance : true,

0
src/definitions/modules/video.less

0
src/definitions/views/comment.less

0
src/definitions/views/feed.less

0
src/definitions/views/item.less

15
src/definitions/views/list.less

@ -373,7 +373,7 @@ ul.ui.horizontal.bulleted.list li:first-child::before,
ol.ui.list,
.ui.ordered.list {
counter-reset: ordered;
margin-left: 2em;
margin-left: 1em;
list-style-type: none;
}
ol.ui.list li,
@ -384,14 +384,14 @@ ol.ui.list li,
ol.ui.list li:before,
.ui.ordered.list .item:before {
position: absolute;
left: -2em;
left: -1em;
counter-increment: ordered;
content: counters(ordered, ".");
text-align: right;
vertical-align: top;
opacity: 0.75;
opacity: 0.5;
}
ol.ui.list ol,
@ -402,7 +402,7 @@ ol.ui.list ol,
ol.ui.list ol li:before,
.ui.ordered.list .list .item:before {
left: -2.5em;
left: -2em;
}
/* Horizontal Ordered */
@ -421,10 +421,13 @@ ol.ui.horizontal.list li:before,
Divided
--------------------*/
.ui.divided.list > .item,
.ui.divided.list:not(.horizontal) > .list {
.ui.divided.list .item,
.ui.divided.list:not(.horizontal) .list {
border-top: 1px solid rgba(0, 0, 0, 0.1);
}
.ui.divided.list .list .item {
border-top: none;
}
.ui.divided.list .item .menu .item {
border-width: 0px;
}

0
src/definitions/views/statistic.less

Loading…
Cancel
Save