semantic-ui-rails 0.3.5 → 0.6.5

data/vendor/assets/javascripts/semantic-ui/modules/modal.js

@@ -33,7 +33,7 @@ $.fn.modal = function(parameters) {
       var
         settings    = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.modal.settings, parameters)
-          : $.fn.modal.settings,
+          : $.extend({}, $.fn.modal.settings),
 
         selector        = settings.selector,
         className       = settings.className,
@@ -50,6 +50,7 @@ $.fn.modal = function(parameters) {
         $close       = $module.find(selector.close),
 
         $focusedElement,
+        $dimmable,
         $dimmer,
 
         element      = this,
@@ -62,9 +63,17 @@ $.fn.modal = function(parameters) {
         initialize: function() {
           module.verbose('Initializing dimmer', $context);
 
-          $dimmer = $context
+          $dimmable = $context
+            .dimmer({
+              closable : false,
+              show     : settings.duration * 0.95,
+              hide     : settings.duration * 1.05
+            })
             .dimmer('add content', $module)
           ;
+          $dimmer = $dimmable
+            .dimmer('get dimmer')
+          ;
 
           module.verbose('Attaching close events', $close);
           $close
@@ -89,8 +98,15 @@ $.fn.modal = function(parameters) {
         destroy: function() {
           module.verbose('Destroying previous modal');
           $module
+            .removeData(moduleNamespace)
+            .off(eventNamespace)
+          ;
+          $close
             .off(eventNamespace)
           ;
+          $context
+            .dimmer('destroy')
+          ;
         },
 
         refresh: function() {
@@ -122,9 +138,22 @@ $.fn.modal = function(parameters) {
 
         event: {
           close: function() {
-            module.verbose('Close button pressed');
+            module.verbose('Closing element pressed');
+            if( $(this).is(selector.approve) ) {
+              $.proxy(settings.onApprove, element)();
+            }
+            if( $(this).is(selector.deny) ) {
+              $.proxy(settings.onDeny, element)();
+            }
             module.hide();
           },
+          click: function(event) {
+            module.verbose('Determining if event occured on dimmer', event);
+            if( $dimmer.find(event.target).size() === 0 ) {
+              module.hide();
+              event.stopImmediatePropagation();
+            }
+          },
           debounce: function(method, delay) {
             clearTimeout(module.timer);
             module.timer = setTimeout(method, delay);
@@ -135,13 +164,18 @@ $.fn.modal = function(parameters) {
               escapeKey = 27
             ;
             if(keyCode == escapeKey) {
-              module.debug('Escape key pressed hiding modal');
-              module.hide();
+              if(settings.closable) {
+                module.debug('Escape key pressed hiding modal');
+                module.hide();
+              }
+              else {
+                module.debug('Escape key pressed, but closable is set to false');
+              }
               event.preventDefault();
             }
           },
           resize: function() {
-            if( $dimmer.dimmer('is active') ) {
+            if( $dimmable.dimmer('is active') ) {
               module.refresh();
             }
           }
@@ -177,13 +211,17 @@ $.fn.modal = function(parameters) {
 
         showDimmer: function() {
           module.debug('Showing modal');
-          module.set.dimmerSettings();
-          $dimmer.dimmer('show');
+          $dimmable.dimmer('show');
         },
 
         hide: function() {
-          if( $dimmer.dimmer('is active') ) {
-            $dimmer.dimmer('hide');
+          if(settings.closable) {
+            $dimmer
+              .off('click' + eventNamespace)
+            ;
+          }
+          if( $dimmable.dimmer('is active') ) {
+            $dimmable.dimmer('hide');
           }
           if( module.is.active() ) {
             module.hideModal();
@@ -196,7 +234,7 @@ $.fn.modal = function(parameters) {
 
         hideDimmer: function() {
           module.debug('Hiding dimmer');
-          $dimmer.dimmer('hide');
+          $dimmable.dimmer('hide');
         },
 
         hideModal: function() {
@@ -261,7 +299,7 @@ $.fn.modal = function(parameters) {
             ;
           },
           scrolling: function() {
-            $dimmer.removeClass(className.scrolling);
+            $dimmable.removeClass(className.scrolling);
             $module.removeClass(className.scrolling);
           }
         },
@@ -271,7 +309,7 @@ $.fn.modal = function(parameters) {
             height        : $module.outerHeight() + settings.offset,
             contextHeight : (settings.context == 'body')
               ? $(window).height()
-              : $dimmer.height()
+              : $dimmable.height()
           };
           module.debug('Caching modal and container sizes', module.cache);
         },
@@ -290,6 +328,7 @@ $.fn.modal = function(parameters) {
 
         set: {
           active: function() {
+            module.add.keyboardShortcuts();
             module.save.focus();
             module.set.type();
             $module
@@ -297,27 +336,12 @@ $.fn.modal = function(parameters) {
             ;
             if(settings.closable) {
               $dimmer
-                .dimmer('get dimmer')
-                .on('click', module.hide)
+                .on('click' + eventNamespace, module.event.click)
               ;
             }
           },
-          dimmerSettings: function() {
-            module.debug('Setting dimmer settings', $dimmer);
-            $dimmer
-              .dimmer('setting', 'closable', false)
-              .dimmer('setting', 'duration', {
-                show : settings.duration * 0.95,
-                hide : settings.duration * 1.05
-              })
-              .dimmer('setting', 'onShow' , module.add.keyboardShortcuts)
-              // destory after changing settings in order to reattach events
-              .dimmer('destroy')
-              .dimmer('initialize')
-            ;
-          },
           scrolling: function() {
-            $dimmer.addClass(className.scrolling);
+            $dimmable.addClass(className.scrolling);
             $module.addClass(className.scrolling);
           },
           type: function() {
@@ -547,9 +571,13 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
-    close : '.close, .actions .button'
+    close    : '.close, .actions .button',
+    approve  : '.actions .positive, .actions .approve',
+    deny     : '.actions .negative, .actions .cancel'
   },
   error : {
     method : 'The method you called is not defined.'

data/vendor/assets/javascripts/semantic-ui/modules/popup.js

@@ -32,7 +32,7 @@ $.fn.popup = function(parameters) {
       var
         settings        = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.popup.settings, parameters)
-          : $.fn.popup.settings,
+          : $.extend({}, $.fn.popup.settings),
 
         selector        = settings.selector,
         className       = settings.className,
@@ -41,7 +41,7 @@ $.fn.popup = function(parameters) {
         namespace       = settings.namespace,
 
         eventNamespace  = '.' + settings.namespace,
-        moduleNamespace = settings.namespace + '-module',
+        moduleNamespace = 'module-' + namespace,
 
         $module         = $(this),
 
@@ -98,6 +98,9 @@ $.fn.popup = function(parameters) {
 
         destroy: function() {
           module.debug('Destroying previous module');
+          $window
+            .off(eventNamespace)
+          ;
           $module
             .off(eventNamespace)
             .removeData(moduleNamespace)

data/vendor/assets/javascripts/semantic-ui/modules/rating.js

@@ -27,7 +27,9 @@ $.fn.rating = function(parameters) {
   $allModules
     .each(function() {
       var
-        settings        = $.extend(true, {}, $.fn.rating.settings, parameters),
+        settings        = ( $.isPlainObject(parameters) )
+          ? $.extend(true, {}, $.fn.rating.settings, parameters)
+          : $.extend({}, $.fn.rating.settings),
 
         namespace       = settings.namespace,
         className       = settings.className,
@@ -38,11 +40,12 @@ $.fn.rating = function(parameters) {
         eventNamespace  = '.' + namespace,
         moduleNamespace = 'module-' + namespace,
 
+        element         = this,
+        instance        = $(this).data(moduleNamespace),
+
         $module         = $(this),
         $icon           = $module.find(selector.icon),
 
-        element         = this,
-        instance        = $module.data(moduleNamespace),
         module
       ;
 
@@ -71,12 +74,14 @@ $.fn.rating = function(parameters) {
 
         instantiate: function() {
           module.verbose('Instantiating module', settings);
+          instance = module;
           $module
             .data(moduleNamespace, module)
           ;
         },
 
         destroy: function() {
+          module.verbose('Destroying previous instance', instance);
           $module
             .removeData(moduleNamespace)
           ;
@@ -274,6 +279,9 @@ $.fn.rating = function(parameters) {
             if(moduleSelector) {
               title += ' \'' + moduleSelector + '\'';
             }
+            if($allModules.size() > 1) {
+              title += ' ' + '(' + $allModules.size() + ')';
+            }
             if( (console.group !== undefined || console.table !== undefined) && performance.length > 0) {
               console.groupCollapsed(title);
               if(console.table) {
@@ -343,7 +351,6 @@ $.fn.rating = function(parameters) {
           return found;
         }
       };
-
       if(methodInvoked) {
         if(instance === undefined) {
           module.initialize();

data/vendor/assets/javascripts/semantic-ui/modules/sidebar.js

@@ -30,7 +30,7 @@ $.fn.sidebar = function(parameters) {
       var
         settings        = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.sidebar.settings, parameters)
-          : $.fn.sidebar.settings,
+          : $.extend({}, $.fn.sidebar.settings),
 
         selector        = settings.selector,
         className       = settings.className,

data/vendor/assets/javascripts/semantic-ui/modules/tab.js

@@ -38,7 +38,7 @@
       error           = settings.error,
 
       eventNamespace  = '.' + settings.namespace,
-      moduleNamespace = settings.namespace + '-module',
+      moduleNamespace = 'module-' + settings.namespace,
 
       instance        = $module.data(moduleNamespace),
 
@@ -103,6 +103,7 @@
       destroy: function() {
         module.debug('Destroying tabs', $module);
         $module
+          .removeData(moduleNamespace)
           .off(eventNamespace)
         ;
       },

data/vendor/assets/javascripts/semantic-ui/modules/transition.js

@@ -314,7 +314,7 @@ $.fn.transition = function() {
                 animation : animation
               });
             }
-            return $.fn.transition.settings;
+            return $.extend({}, $.fn.transition.settings);
           },
 
           animationName: function() {

data/vendor/assets/javascripts/semantic-ui/modules/video.js

@@ -32,7 +32,7 @@ $.fn.video = function(parameters) {
       var
         settings        = ( $.isPlainObject(parameters) )
           ? $.extend(true, {}, $.fn.video.settings, parameters)
-          : $.fn.video.settings,
+          : $.extend({}, $.fn.video.settings),
 
         selector        = settings.selector,
         className       = settings.className,
@@ -41,7 +41,7 @@ $.fn.video = function(parameters) {
         namespace       = settings.namespace,
 
         eventNamespace  = '.' + namespace,
-        moduleNamespace = namespace + '-module',
+        moduleNamespace = 'module-' + namespace,
 
         $module         = $(this),
         $placeholder    = $module.find(selector.placeholder),
@@ -80,6 +80,12 @@ $.fn.video = function(parameters) {
             .removeData(moduleNamespace)
             .off(eventNamespace)
           ;
+          $placeholder
+            .off(eventNamespace)
+          ;
+          $playButton
+            .off(eventNamespace)
+          ;
         },
 
         // sets new video

data/vendor/assets/stylesheets/semantic-ui/collections/menu.less

@@ -237,34 +237,45 @@
   margin-bottom: 0px;
 }
 
+
+/*--------------
+     Button
+---------------*/
+
+.ui.menu:not(.vertical) .item > .button {
+  position: relative;
+  top: -0.05em;
+
+  margin: -0.55em 0;
+  padding-bottom: 0.55em;
+  padding-top: 0.55em;
+
+  font-size: 0.875em;
+  box-shadow: none;
+}
+
+
 /*--------------
      Inputs
 ---------------*/
 
-.ui.menu .item > .input,
-.ui.menu .item > .input input {
+.ui.menu:not(.vertical) .item > .input {
+  margin-top: -0.83em;
+  margin-bottom: -0.83em;
+  padding-top: 0.3em;
+  padding-bottom: 0.3em;
   width: 100%;
 }
-.ui.menu .ui.input > .icon {
-  padding-top: 0.1em;
-  height: auto;
-}
-.ui.menu .item > .input input,
-.ui.menu .item > input[type="text"] {
-  position: relative;
-  margin: -0.45em 0em;
-  padding-top: 0.45em;
-  padding-bottom: 0.45em;
+.ui.menu .item > .input input {
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
 }
-.ui.vertical.menu .item > .input input,
-.ui.vertical.menu .item > input[type="text"] {
-  top: 0em;
+.ui.vertical.menu .item > .input input {
   margin: 0em;
   padding-top: 0.63em;
   padding-bottom: 0.63em;
 }
 .ui.vertical.menu .ui.input > .icon {
-  top: 0px;
   padding-top: 0.63em;
 }
 
@@ -284,9 +295,12 @@
 /*--------------
     Dropdowns
 ---------------*/
-/*.ui.menu .dropdown.item .menu {
+.ui.menu .dropdown.item .menu {
+  left: 1px;
   margin: 1px 0px 0px 0px;
-}*/
+  min-width: calc(100% - 1px);
+  box-shadow: 0 1px 1px 1px #DDDDDD;
+}
 .ui.menu .simple.dropdown.item .menu {
   margin: 0px !important;
 }
@@ -536,11 +550,13 @@
 /*--- Dropdown ---*/
 .ui.vertical.menu .dropdown.item > i {
   float: right;
+  content: "\f0da";
 }
 .ui.vertical.menu .dropdown.item .menu {
   top: 0% !important;
   left: 100%;
   margin: 0px 0px 0px 1px;
+  box-shadow: 0 0px 1px 1px #DDDDDD;
 }
 .ui.vertical.menu .dropdown.item.active {
   border-top-right-radius: 0em;
@@ -739,10 +755,12 @@
 }
 
 .ui.pagination.menu .item {
-  min-width: 2.7em;
-  min-height: 2.7em;
+  min-width: 3em;
   text-align: center;
 }
+.ui.pagination.menu .icon.item .icon {
+  vertical-align: top;
+}
 .ui.pagination.menu.floated {
   display: block;
 }
@@ -772,6 +790,7 @@
   -moz-box-shadow: none;
   box-shadow: none;
 }
+.ui.secondary.menu > .menu > .item,
 .ui.secondary.menu > .item {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
@@ -787,10 +806,15 @@
   -moz-border-radius: 0.3125em;
   border-radius: 0.3125em;
 }
+.ui.secondary.menu > .menu > .item:before,
 .ui.secondary.menu > .item:before {
   display: none !important;
 }
 
+.ui.secondary.menu .item > .input input {
+  background-color: transparent;
+  border: none;
+}
 .ui.secondary.menu .link.item,
 .ui.secondary.menu a.item {
   opacity: 0.8;
@@ -801,7 +825,6 @@
   -ms-transition: none;
   transition: none;
 }
-
 .ui.secondary.menu .header.item {
   border-right: 0.1em solid rgba(0, 0, 0, 0.1);
   background-color: transparent;
@@ -818,6 +841,7 @@
 }
 
 /* active */
+.ui.secondary.menu > .menu > .active.item,
 .ui.secondary.menu > .active.item {
   background-color: rgba(0, 0, 0, 0.08);
   opacity: 1;
@@ -862,18 +886,9 @@
 
 .ui.secondary.pointing.menu {
   border-bottom: 3px solid rgba(0, 0, 0, 0.1);
-
-}
-
-.ui.secondary.pointing.menu .header.item {
-  border-right-width: 0px;
-  font-weight: bold;
-}
-
-.ui.secondary.pointing.menu .text.item {
-  box-shadow: none !important;
 }
 
+.ui.secondary.pointing.menu > .menu > .item,
 .ui.secondary.pointing.menu > .item {
   margin: 0em 0em -3px;
   padding: 0.6em 0.95em;
@@ -900,24 +915,40 @@
     color 0.2s
   ;
 }
+
+/* Item Types */
+.ui.secondary.pointing.menu .header.item {
+  border-right-width: 0px;
+  font-weight: bold;
+}
+.ui.secondary.pointing.menu .text.item {
+  box-shadow: none !important;
+}
+.ui.secondary.pointing.menu > .menu > .item:after,
 .ui.secondary.pointing.menu > .item:after {
   display: none;
 }
 
 /* Hover */
-.ui.secondary.pointing.menu > .item.hover,
-.ui.secondary.pointing.menu > .item:hover {
+.ui.secondary.pointing.menu > .menu > .link.item:hover,
+.ui.secondary.pointing.menu > .link.item:hover,
+.ui.secondary.pointing.menu > .menu > a.item:hover,
+.ui.secondary.pointing.menu > a.item:hover {
   background-color: transparent;
   color: rgba(0, 0, 0, 0.7);
 }
 
 /* Down */
-.ui.secondary.pointing.menu > .item:active {
+.ui.secondary.pointing.menu > .menu > .link.item:active,
+.ui.secondary.pointing.menu > .link.item:active,
+.ui.secondary.pointing.menu > .menu > a.item:active,
+.ui.secondary.pointing.menu > a.item:active {
   background-color: transparent;
   border-color: rgba(0, 0, 0, 0.2);
 }
 
 /* Active */
+.ui.secondary.pointing.menu > .menu > .item.active,
 .ui.secondary.pointing.menu > .item.active {
   background-color: transparent;
   border-color: rgba(0, 0, 0, 0.4);
@@ -1744,6 +1775,10 @@
 .ui.small.menu .item {
   font-size: 0.875rem;
 }
+.ui.small.menu:not(.vertical) .item > .input input {
+  padding-top: 0.4em;
+  padding-bottom: 0.4em;
+}
 .ui.small.vertical.menu {
   width: 13rem;
 }
@@ -1762,6 +1797,14 @@
 .ui.large.menu .item .item {
   font-size: 0.875rem;
 }
+.ui.large.menu:not(.vertical) .item > .input input {
+  top: -0.125em;
+  padding-bottom: 0.6em;
+  padding-top: 0.6em;
+}
+.ui.large.menu .dropdown.item .item {
+  font-size: 1rem;
+}
 .ui.large.vertical.menu {
   width: 18rem;
 }