fomantic-ui 2.9.0-beta.285 → 2.9.0-beta.286

package/src/definitions/modules/dropdown.js

@@ -30,11 +30,6 @@ $.fn.dropdown = function(parameters) {
 
     moduleSelector = $allModules.selector || '',
 
-    hasTouch       = ('ontouchstart' in document.documentElement),
-    clickEvent      = hasTouch
-        ? 'touchstart'
-        : 'click',
-
     time           = new Date().getTime(),
     performance    = [],
 
@@ -541,9 +536,7 @@ $.fn.dropdown = function(parameters) {
             }
             if(settings.onShow.call(element) !== false) {
               module.animate.show(function() {
-                if( module.can.click() ) {
-                  module.bind.intent();
-                }
+                module.bind.intent();
                 if(module.has.search() && !preventFocus) {
                   module.focusSearch();
                 }
@@ -570,8 +563,17 @@ $.fn.dropdown = function(parameters) {
                 }
                 callback.call(element);
               });
+              // Hide submenus explicitly. On some browsers (esp. mobile), they will not automatically receive a
+              // mouseleave event
+              var $subMenu = $module.find(selector.menu);
+              if($subMenu.length > 0) {
+                module.verbose('Hiding sub-menu', $subMenu);
+                $subMenu.each(function() {
+                  module.animate.hide(false, $(this));
+                });
+              }
             }
-          } else if( module.can.click() ) {
+          } else {
               module.unbind.intent();
           }
           iconClicked = false;
@@ -639,8 +641,8 @@ $.fn.dropdown = function(parameters) {
             module.verbose('Binding mouse events');
             if(module.is.multiple()) {
               $module
-                .on(clickEvent   + eventNamespace, selector.label,  module.event.label.click)
-                .on(clickEvent   + eventNamespace, selector.remove, module.event.remove.click)
+                .on('click'   + eventNamespace, selector.label,  module.event.label.click)
+                .on('click'   + eventNamespace, selector.remove, module.event.remove.click)
               ;
             }
             if( module.is.searchSelection() ) {
@@ -649,31 +651,33 @@ $.fn.dropdown = function(parameters) {
                 .on('mouseup'   + eventNamespace, module.event.mouseup)
                 .on('mousedown' + eventNamespace, selector.menu,   module.event.menu.mousedown)
                 .on('mouseup'   + eventNamespace, selector.menu,   module.event.menu.mouseup)
-                .on(clickEvent  + eventNamespace, selector.icon,   module.event.icon.click)
-                .on(clickEvent  + eventNamespace, selector.clearIcon, module.event.clearIcon.click)
+                .on('click'     + eventNamespace, selector.icon,   module.event.icon.click)
+                .on('click'     + eventNamespace, selector.clearIcon, module.event.clearIcon.click)
                 .on('focus'     + eventNamespace, selector.search, module.event.search.focus)
-                .on(clickEvent  + eventNamespace, selector.search, module.event.search.focus)
+                .on('click'     + eventNamespace, selector.search, module.event.search.focus)
                 .on('blur'      + eventNamespace, selector.search, module.event.search.blur)
-                .on(clickEvent  + eventNamespace, selector.text,   module.event.text.focus)
+                .on('click'     + eventNamespace, selector.text,   module.event.text.focus)
               ;
               if(module.is.multiple()) {
                 $module
-                  .on(clickEvent + eventNamespace, module.event.click)
-                  .on(clickEvent + eventNamespace, module.event.search.focus)
+                  .on('click' + eventNamespace, module.event.click)
+                  .on('click' + eventNamespace, module.event.search.focus)
                 ;
               }
             }
             else {
               if(settings.on == 'click') {
                 $module
-                  .on(clickEvent + eventNamespace, selector.icon, module.event.icon.click)
-                  .on(clickEvent + eventNamespace, module.event.test.toggle)
+                  .on('click' + eventNamespace, selector.icon, module.event.icon.click)
+                  .on('click' + eventNamespace, module.event.test.toggle)
                 ;
               }
               else if(settings.on == 'hover') {
                 $module
                   .on('mouseenter' + eventNamespace, module.delay.show)
                   .on('mouseleave' + eventNamespace, module.delay.hide)
+                  .on('touchstart' + eventNamespace, module.event.test.toggle)
+                  .on('touchstart' + eventNamespace, selector.icon, module.event.icon.click)
                 ;
               }
               else {
@@ -685,7 +689,7 @@ $.fn.dropdown = function(parameters) {
                 .on('mousedown' + eventNamespace, module.event.mousedown)
                 .on('mouseup'   + eventNamespace, module.event.mouseup)
                 .on('focus'     + eventNamespace, module.event.focus)
-                .on(clickEvent  + eventNamespace, selector.clearIcon, module.event.clearIcon.click)
+                .on('click'     + eventNamespace, selector.clearIcon, module.event.clearIcon.click)
               ;
               if(module.has.menuSearch() ) {
                 $module
@@ -699,21 +703,16 @@ $.fn.dropdown = function(parameters) {
               }
             }
             $menu
-              .on((hasTouch ? 'touchstart' : 'mouseenter') + eventNamespace, selector.item, module.event.item.mouseenter)
+              .on('mouseenter' + eventNamespace, selector.item, module.event.item.mouseenter)
+              .on('touchstart' + eventNamespace, selector.item, module.event.item.mouseenter)
               .on('mouseleave' + eventNamespace, selector.item, module.event.item.mouseleave)
               .on('click'      + eventNamespace, selector.item, module.event.item.click)
             ;
           },
           intent: function() {
             module.verbose('Binding hide intent event to document');
-            if(hasTouch) {
-              $document
-                .on('touchstart' + elementNamespace, module.event.test.touch)
-                .on('touchmove'  + elementNamespace, module.event.test.touch)
-              ;
-            }
             $document
-              .on(clickEvent + elementNamespace, module.event.test.hide)
+              .on('click' + elementNamespace, module.event.test.hide)
             ;
           }
         },
@@ -721,14 +720,8 @@ $.fn.dropdown = function(parameters) {
         unbind: {
           intent: function() {
             module.verbose('Removing hide intent event from document');
-            if(hasTouch) {
-              $document
-                .off('touchstart' + elementNamespace)
-                .off('touchmove' + elementNamespace)
-              ;
-            }
             $document
-              .off(clickEvent + elementNamespace)
+              .off('click' + elementNamespace)
             ;
           }
         },
@@ -1267,23 +1260,12 @@ $.fn.dropdown = function(parameters) {
               if (!module.is.multiple() || (module.is.multiple() && !module.is.active())) {
                 focused = true;
               }
-              if( module.determine.eventOnElement(event, toggleBehavior) ) {
+              if( module.determine.eventOnElement(event, toggleBehavior) && event.type !== 'touchstart') {
+                // do not preventDefault of touchstart; so emulated mouseenter is triggered on first touch and not later
+                // (when selecting an item). The double-showing of the dropdown through both events does not hurt.
                 event.preventDefault();
               }
             },
-            touch: function(event) {
-              module.determine.eventOnElement(event, function() {
-                if(event.type == 'touchstart') {
-                  module.timer = setTimeout(function() {
-                    module.hide();
-                  }, settings.delay.touch);
-                }
-                else if(event.type == 'touchmove') {
-                  clearTimeout(module.timer);
-                }
-              });
-              event.stopPropagation();
-            },
             hide: function(event) {
               if(module.determine.eventInModule(event, module.hide)){
                 if(element.id && $(event.target).attr('for') === element.id){
@@ -1367,13 +1349,15 @@ $.fn.dropdown = function(parameters) {
             },
             mouseleave: function(event) {
               var
-                $subMenu = $(this).children(selector.menu)
+                $subMenu = $(this).find(selector.menu)
               ;
               if($subMenu.length > 0) {
                 clearTimeout(module.itemTimer);
                 module.itemTimer = setTimeout(function() {
                   module.verbose('Hiding sub-menu', $subMenu);
-                  module.animate.hide(false, $subMenu);
+                  $subMenu.each(function() {
+                    module.animate.hide(false, $(this));
+                  });
                 }, settings.delay.hide);
               }
             },
@@ -3626,9 +3610,6 @@ $.fn.dropdown = function(parameters) {
             $currentMenu.removeClass(className.loading);
             return canOpenRightward;
           },
-          click: function() {
-            return (hasTouch || settings.on == 'click');
-          },
           extendSelect: function() {
             return settings.allowAdditions || settings.apiSettings;
           },
@@ -3698,9 +3679,7 @@ $.fn.dropdown = function(parameters) {
               start = ($subMenu)
                 ? function() {}
                 : function() {
-                  if( module.can.click() ) {
-                    module.unbind.intent();
-                  }
+                  module.unbind.intent();
                   module.remove.active();
                 },
               transition = settings.transition.hideMethod || module.get.transition($subMenu)
@@ -4077,7 +4056,6 @@ $.fn.dropdown.settings = {
     hide   : 300,
     show   : 200,
     search : 20,
-    touch  : 50
   },
 
   /* Callbacks */

package/tasks/admin/distributions/create.js

@@ -205,4 +205,4 @@ module.exports = function(callback) {
   }
 
   gulp.series(...tasks)(callback);
-};
+};

package/tasks/admin/publish.js

@@ -21,4 +21,4 @@ module.exports = function (callback) {
     'update components', // commit components to github
   )(callback);
 
-};
+};

package/tasks/admin/release.js

@@ -25,4 +25,4 @@ module.exports = function (callback) {
     'create components', // update each repo
   )(callback);
 
-};
+};

package/tasks/build/assets.js

@@ -60,4 +60,4 @@ module.exports.watch = function (type, config) {
     });
 };
 
-module.exports.buildAssets = buildAssets;
+module.exports.buildAssets = buildAssets;

package/tasks/build/css.js

@@ -269,4 +269,4 @@ module.exports.watch = function (type, config) {
 };
 
 // Expose build css method
-module.exports.buildCSS = buildCSS;
+module.exports.buildCSS = buildCSS;

package/tasks/build/javascript.js

@@ -156,4 +156,4 @@ module.exports.watch = function (type, config) {
     });
 };
 
-module.exports.buildJS = buildJS;
+module.exports.buildJS = buildJS;

package/tasks/check-install.js

@@ -24,4 +24,4 @@ module.exports = function (callback) {
     }
   }, 50); // Delay to allow console.clear to remove messages from check event
 
-};
+};

package/tasks/clean.js

@@ -11,4 +11,4 @@ var
 // cleans distribution files
 module.exports = function() {
   return del([config.paths.clean], tasks.settings.del);
-};
+};

package/tasks/collections/README.md

@@ -13,4 +13,4 @@ gulp = install(gulp);
 
 // tasks are now injected and ready to be used
 gulp.start('install');
-```
+```

package/tasks/collections/admin.js

@@ -61,4 +61,4 @@ module.exports = function (gulp) {
   gulp.task('register', register);
   gulp.task('register').description = 'Registers all packages with NPM';
 
-};
+};

package/tasks/config/admin/oauth.example.js

@@ -8,4 +8,4 @@ module.exports = {
   username : 'github-username',
   name     : 'Your Name',
   email    : 'user@email.com'
-};
+};

package/tasks/config/admin/templates/composer.json

@@ -19,4 +19,4 @@
     "framework"
   ],
   "license" : "MIT"
-}
+}

package/tasks/rtl/watch.js

@@ -9,4 +9,4 @@ var
 // RTL watch are now handled by the default watch process
 module.exports = function (callback) {
   gulp.series(require('../watch'))(callback);
-};
+};

package/tasks/version.js

@@ -9,4 +9,4 @@ var
 module.exports = function(callback) {
   console.log(release.title + ' ' + release.version);
   callback();
-};
+};

package/test/fixtures/accordion.html

@@ -21,4 +21,4 @@
     <p>Three common ways for a prospective owner to acquire a dog is from pet shops, private owners, or shelters.</p>
     <p>A pet shop may be the most convenient way to buy a dog. Buying a dog from a private owner allows you to assess the pedigree and upbringing of your dog before choosing to take it home. Lastly, finding your dog from a shelter, helps give a good home to a dog who may not find one so readily.</p>
   </div>
-</div>
+</div>

package/test/fixtures/checkbox.html

@@ -43,4 +43,4 @@
       <label>Allow other people to pet my dog</label>
     </div>
   </div>
-</div>
+</div>

package/test/fixtures/dropdown.html

@@ -6,4 +6,4 @@
     <div class="item" data-value="male">Male</div>
     <div class="item" data-value="female">Female</div>
   </div>
-</div>
+</div>

package/test/fixtures/modal.html

@@ -22,4 +22,4 @@
       <i class="checkmark icon"></i>
     </div>
   </div>
-</div>
+</div>

package/test/fixtures/popup.html

@@ -5,4 +5,4 @@
 <i class="circular heart icon link" data-content="Right Center" data-position="right center"></i>
 <i class="circular heart icon link" data-content="Bottom Left" data-position="bottom left"></i>
 <i class="circular heart icon link" data-content="Bottom Center" data-position="bottom center"></i>
-<i class="circular heart icon link" data-content="Bottom Right" data-position="bottom right"></i>
+<i class="circular heart icon link" data-content="Bottom Right" data-position="bottom right"></i>

package/test/fixtures/rating.html

@@ -4,4 +4,4 @@
   <i class="icon"></i>
   <i class="icon"></i>
   <i class="icon"></i>
-</div>
+</div>

package/test/fixtures/shape.html

@@ -4,4 +4,4 @@
     <div class="side">This side is not visible.</div>
     <div class="side">This side is not visible.</div>
   </div>
-</div>
+</div>

package/test/fixtures/sidebar.html

@@ -22,4 +22,4 @@
 <div class="ui disabled teal toggle button">
   <i class="left arrow icon"></i>
   Trigger Sidebar
-</div>
+</div>

package/test/fixtures/tab.html

@@ -5,4 +5,4 @@
 </div>
 <div class="ui active tab segment" data-tab="first">First</div>
 <div class="ui tab segment" data-tab="second">Second</div>
-<div class="ui tab segment" data-tab="third">Third</div>
+<div class="ui tab segment" data-tab="third">Third</div>

package/test/fixtures/transition.html

@@ -1 +1 @@
-<div class="ui image"></div>
+<div class="ui image"></div>

package/test/fixtures/video.html

@@ -2,4 +2,4 @@
   <div class="play"></div>
   <div class="placeholder"></div>
   <div class="embed"></div>
-</div>
+</div>

package/test/helpers/jasmine-jquery.js

@@ -702,4 +702,4 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   global.getJSONFixture = function (url) {
     return jasmine.getJSONFixtures().proxyCallTo_('read', arguments)[url]
   }
-}(jasmine, window);
+}(jasmine, window);

package/test/helpers/jasmine-sinon.js

@@ -55,4 +55,4 @@
     this.addMatchers(spyMatcherHash);
   });
 
-})(jasmine, beforeEach);
+})(jasmine, beforeEach);

package/test/helpers/jquery-events.js

@@ -25,4 +25,4 @@
     $.fn.events = function(selector) {
         return $.events(selector, this);
     }
-})(jQuery);
+})(jQuery);

package/test/helpers/sinon.js

@@ -4816,4 +4816,4 @@ if (typeof module !== 'undefined' && module.exports) {
     }
 }(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : (typeof self != "undefined") ? self : global));
 
-return sinon;}.call(typeof window != 'undefined' && window || {}));
+return sinon;}.call(typeof window != 'undefined' && window || {}));

package/test/meteor/fonts.js

@@ -13,4 +13,4 @@
       });
     });
   })
-;
+;

package/test/modules/accordion.spec.js

@@ -7,4 +7,4 @@ describe("UI Accordion", function() {
     element : '.ui.accordion'
   });
 
-});
+});

package/test/modules/checkbox.spec.js

@@ -5,4 +5,4 @@ describe("UI Checkbox", function() {
     element : '.ui.checkbox'
   });
 
-});
+});

package/test/modules/dropdown.spec.js

@@ -5,4 +5,4 @@ describe("UI Dropdown", function() {
     element : '.ui.dropdown'
   });
 
-});
+});

package/test/modules/modal.spec.js

@@ -7,4 +7,4 @@ describe("UI Modal", function() {
     element : '.ui.modal'
   });
 
-});
+});

package/test/modules/module.spec.js

@@ -215,4 +215,4 @@ function moduleTests(ui) {
 
   });
 
-}
+}

package/test/modules/popup.spec.js

@@ -5,4 +5,4 @@ xdescribe("UI Popup", function() {
     element : 'i.icon'
   });
 
-});
+});

package/test/modules/search.spec.js

@@ -5,4 +5,4 @@ xdescribe("UI Search", function() {
     element   : '.ui.search'
   });
 
-});
+});

package/test/modules/shape.spec.js

@@ -5,4 +5,4 @@ describe("UI Shape", function() {
     element   : '.ui.shape'
   });
 
-});
+});

package/test/modules/sidebar.spec.js

@@ -5,4 +5,4 @@ describe("UI Rating", function() {
     element : '.ui.rating'
   });
 
-});
+});

package/test/modules/tab.spec.js

@@ -6,4 +6,4 @@ xdescribe("UI Tab", function() {
     singleton : true
   });
 
-});
+});

package/test/modules/transition.spec.js

@@ -5,4 +5,4 @@ xdescribe("UI Transition", function() {
     element : '.ui.image'
   });
 
-});
+});

package/test/modules/video.spec.js

@@ -5,4 +5,4 @@ describe("UI Video", function() {
     element : '.ui.video'
   });
 
-});
+});