Merge branch 'master' of github.com:jlukic/Semantic-UI

RELEASE NOTES.md

@@ -1,5 +1,12 @@
 ## RELEASE NOTES
 
+### Version 0.6.5 - Oct 18, 2013
+
+**Fixes**
+- Fixes issue where browser default action, like link clicking, was prevented on dropdown item click
+- Modal keyboard shortcuts now obey settings.closable (credit to luisrudge)
+
+
 ### Version 0.6.4 - Oct 16, 2013
 
 **Fixes**

build/less/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

build/minified/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

build/packaged/javascript/semantic.js

@@ -5414,8 +5414,13 @@ $.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();
             }
           },
@@ -5816,8 +5821,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

build/uncompressed/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "semantic",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "title": "Semantic UI",
   "description": "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage": "http://www.semantic-ui.com",

rtl/less/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

rtl/minified/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

rtl/packaged/javascript/semantic.js

@@ -5414,8 +5414,13 @@ $.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();
             }
           },
@@ -5816,8 +5821,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

rtl/uncompressed/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',

server/documents/index.html.eco

@@ -15,7 +15,7 @@ type   : 'Semantic'
   <div class="ui page grid">
     <div class="column">
       <div class="introduction">
-        <h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.6.4</a></h1>
+        <h1 class="ui header">Semantic UI <a class="ui black label" href="https://github.com/jlukic/Semantic-UI/blob/master/RELEASE%20NOTES.md">0.6.5</a></h1>
         <h2 class="ui header">UI is the vocabulary of the web.</h2>
         <p>Semantic empowers designers and developers by creating a language for sharing UI.</p>
         <a class="ui black large labeled launch icon button"><i class="icon list layout"></i> View UI</a>

server/documents/introduction/variations.html.eco

@@ -13,7 +13,7 @@ type        : 'UI Introduction'
   <div class="peek">
     <div class="ui vertical pointing secondary menu">
       <a class="active item">Overview</a>
-      <a class="active item">Usage</a>
+      <a class="item">Usage</a>
     </div>
   </div>
 
@@ -129,4 +129,4 @@ type        : 'UI Introduction'
   </a>
 <!--
 
-</div>
+</div>

server/documents/modules/dropdown.html.eco

@@ -207,7 +207,7 @@ type        : 'UI Module'
 
   <div class="dropdown example">
   <h4 class="ui header">Button Group</h4>
-    <p>A <a href="/element/button.html">button group</a> can be formatted to show additional content as a dropdown</p>
+    <p>A <a href="/elements/button.html">button group</a> can be formatted to show additional content as a dropdown</p>
     <div class="ui red icon buttons">
       <div class="ui top left pointing dropdown button">
         <i class="user icon"></i>
@@ -239,7 +239,7 @@ type        : 'UI Module'
 
   <div class="button example">
     <h4 class="ui header">Combo Button</h4>
-    <p>A <a href="/element/button.html">button</a> can be formatted with a dropdown</p>
+    <p>A <a href="/elements/button.html">button</a> can be formatted with a dropdown</p>
     <div class="ui teal buttons">
       <div class="ui button">Update Post</div>
       <div class="ui teal dropdown icon button">
@@ -286,7 +286,7 @@ type        : 'UI Module'
 
   <div class="hover example">
     <h4 class="ui header">Menu</h4>
-    <p>A <a href="/collection/menu.html">menu</a> element can contain a dropdown</p>
+    <p>A <a href="/collections/menu.html">menu</a> element can contain a dropdown</p>
       <div class="ui compact tiered purple inverted menu">
         <div class="menu">
           <a class="active item">
@@ -320,7 +320,7 @@ type        : 'UI Module'
 
   <div class="dropdown example">
     <h4 class="ui header">Form</h4>
-    <p>A dropdown can be formatted to allow selection inside a <a href="/collection/form.html">form</a></p>
+    <p>A dropdown can be formatted to allow selection inside a <a href="/collections/form.html">form</a></p>
     <div class="ui form segment">
       <p>Let's go ahead and get you signed up.</p>
       <div class="two fields">
@@ -655,4 +655,4 @@ type        : 'UI Module'
 </div>
 </body>
 
-</html>
+</html>

server/documents/project/development.html.eco

@@ -56,10 +56,7 @@ type        : 'Semantic Project'
 
   <h3 class="ui header">4) Start Your Server</h3>
 
-  <p>It's important to note that all server code exists inside of <code>/node</code> in the project. So all commands should be run relative to that directory.</p>
-
   <div class="code" data-title="Starting server locally" data-type="terminal">
-    cd node
     docpad run
   </div>
 
@@ -71,7 +68,7 @@ type        : 'Semantic Project'
 
   <p>If you are working on fixing a UI component that is part of Semantic, your best bet is to work actively on the file in <code>/src/{type}/{elementname}/</code> while running a watch script from grunt. This will rebuild the docs after you make changes, so you can see if you have corrected the issue you are fixing.</p>
 
-  <p>To see exactly what this is doing you can check out our <a href="https://github.com/jlukic/Semantic-UI/blob/master/node/Gruntfile.js">commented gruntfile</a></p>
+  <p>To see exactly what this is doing you can check out our <a href="https://github.com/jlukic/Semantic-UI/blob/master/Gruntfile.js">commented gruntfile</a></p>
 
   <div class="code" data-title="Watching Changes" data-type="terminal">
     grunt
@@ -106,4 +103,4 @@ type        : 'Semantic Project'
     Next: Library Introduction
     <i class="right arrow icon"></i>
   </a>
-</div>
+</div>

src/modules/modal.js

@@ -164,8 +164,13 @@ $.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();
             }
           },
@@ -566,8 +571,8 @@ $.fn.modal.settings = {
 
   onShow      : function(){},
   onHide      : function(){},
-  onApprove   : function(){ console.log('approved'); },
-  onDeny      : function(){ console.log('denied'); },
+  onApprove   : function(){},
+  onDeny      : function(){},
 
   selector    : {
     close    : '.close, .actions .button',