nail_polish 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7942b77d9c027c55a16d69d19e1d9621e96668ce
-  data.tar.gz: 1a0103189b1c0400b2a4187ff8c5e99c339ac16c
+  metadata.gz: dabaa91a6211c871b5dcccf0d4a79acd92c88e0c
+  data.tar.gz: 9a569ffeacf3a950aab6cd40152b5a16469156a1
 SHA512:
-  metadata.gz: e656e2cc235d269bb5b08a4d61b92f353c21d71da55782a714576ed900b8087dc1f46154b5bb01cca981bfa7240ea8c1906d0cfdef5b49d475be30893aa4daab
-  data.tar.gz: 5eae2ecdf00aa5c1a839179691c0cddb164711dce1b2eae4a0e480e8bd62fd27f7e9647cdfb4b7e9d8b8a48b859f7a2919bb84e6bdd0c8e7f175c277af8cecec
+  metadata.gz: 17d5e8ca3bf3094b515e5a6687e6e3935da1735a53900952b07b58eafdcb10851cef16a5b127965a6f57bfbca5dab49fd9e5e26c4cefb5930cbab1271cdc3b02
+  data.tar.gz: 10b9242ce3a4f47a846682987159ae020912e6b7399cd6c1802445c61fd42e09c077c45104edb4c37abf2ac901bc72a6be8cf866ec3959cf8a99c86a4961f430

data/app/assets/javascripts/nail_polish/templates/stackable_modal.mustache

@@ -0,0 +1,6 @@
+<div class='overlay'>
+  <div class='modal l-modal'>
+    {{>modal_content}}
+  </div>
+</div>
+

data/app/assets/javascripts/nail_polish/widget/modal.js

@@ -2,26 +2,28 @@ NailPolish.Widget.Modal = NailPolish.View.extend({
   parent: 'body',
   parentSelector: '#overlay-container',
   attachmentMethod: 'html',
+  baseModalTemplateName: "nail_polish/templates/modal",
+  overlaySelector: "#overlay",
 
   events: function () {
     _.extend(this.addListeners, {
       'click .close-modal': 'close',
-      'click .cancel-link a': 'close',
-      'click #overlay': 'verifyTargetAndClose'
+      'click .cancel-link a': 'close'
     });
 
+    this.addListeners["click " + this.overlaySelector] = "verifyTargetAndClose";
     return NailPolish.View.prototype.events.apply(this);
   },
 
   verifyTargetAndClose: function (e) {
-    if($(e.target).is('#overlay')) {
+    if($(e.target).is(this.overlaySelector)) {
       this.close();
     }
   },
 
   renderTemplate: function () {
     // switch declared template into a partial for consistent usage
-    var template = HoganTemplates['nail_polish/templates/modal'];
+    var template = HoganTemplates[this.baseModalTemplateName];
     var partials = _.extend(this.partials(), {
       modal_content: HoganTemplates[this.templateName]
     });
@@ -45,7 +47,8 @@ NailPolish.Widget.Modal = NailPolish.View.extend({
       e.preventDefault(); // This is necessary to prevent clicking on elements behind the modal
     }
     NailPolish.Events.unsubscribe('page:new', this.close, this);
-    $('body').removeClass('no-scroll');
+
+    this.unfreezeBody();
     this.remove();
     this.onClose();
   },
@@ -66,5 +69,9 @@ NailPolish.Widget.Modal = NailPolish.View.extend({
 
   freezeBody: function() {
     $('body').addClass('no-scroll');
+  },
+
+  unfreezeBody: function() {
+    $('body').removeClass('no-scroll');
   }
 });

data/app/assets/javascripts/nail_polish/widget/stackable_modal.js

@@ -0,0 +1,24 @@
+NailPolish.Widget.StackableModal = NailPolish.Widget.Modal.extend({
+  parentSelector: "#stackable-overlay-container",
+  attachmentMethod: "append",
+  baseModalTemplateName: "nail_polish/templates/stackable_modal",
+  overlaySelector: ".overlay",
+
+  render: function() {
+    NailPolish.Widget.Modal.prototype.render.apply(this);
+    NailPolish.Widget.StackableModal.stackedModalsCount += 1;
+  },
+
+  close: function (e) {
+    NailPolish.Widget.StackableModal.stackedModalsCount -= 1;
+    NailPolish.Widget.Modal.prototype.close.apply(this);
+  },
+
+  unfreezeBody: function() {
+    if (NailPolish.Widget.StackableModal.stackedModalsCount === 0) {
+      NailPolish.Widget.Modal.prototype.unfreezeBody.apply(this);
+    }
+  }
+});
+
+NailPolish.Widget.StackableModal.stackedModalsCount = 0;

data/app/assets/javascripts/nail_polish_widgets.js

@@ -1,4 +1,5 @@
 //= require nail_polish/widget/flash
 //= require nail_polish/widget/modal
+//= require nail_polish/widget/stackable_modal
 //= require nail_polish/widget/dropdown
 //= require nail_polish/widget/menu

data/app/assets/stylesheets/nail_polish/base/layout.scss

@@ -13,6 +13,18 @@ body {
   background: transparent image-url('nail_polish/backgrounds/black-0_5.png') repeat;
 }
 
+#stackable-overlay-container {
+  .overlay {
+    position: fixed;
+    overflow-y: scroll;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: transparent url('nail_polish/backgrounds/black-0_5.png') repeat;
+  }
+}
+
 #page {
   background: $light-color image-url('nail_polish/backgrounds/light_bg.png') repeat;
 

data/app/assets/stylesheets/nail_polish/base/widgets/modal.scss

@@ -2,7 +2,6 @@
   margin: $spacing auto;
   max-width: 300px;
   position: relative;
-  z-index: 10100;
 
   @include border-radius;
 
@@ -17,6 +16,7 @@
 
   .close-icon {
     background: transparent image-url('nail_polish/elements/close_icon.png') no-repeat;
+    cursor: pointer;
     margin-top: $spacing;
     height: 15px;
     width: 15px;

data/lib/nail_polish/version.rb

@@ -1,3 +1,3 @@
 module NailPolish
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nail_polish
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Kane Baccigalupi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - app/assets/javascripts/nail_polish/templates/dropdown.mustache
 - app/assets/javascripts/nail_polish/templates/menu.mustache
 - app/assets/javascripts/nail_polish/templates/modal.mustache
+- app/assets/javascripts/nail_polish/templates/stackable_modal.mustache
 - app/assets/javascripts/nail_polish/utils/subview_manager.js
 - app/assets/javascripts/nail_polish/utils/text.js
 - app/assets/javascripts/nail_polish/validator.js
@@ -201,6 +202,7 @@ files:
 - app/assets/javascripts/nail_polish/widget/flash.js
 - app/assets/javascripts/nail_polish/widget/menu.js
 - app/assets/javascripts/nail_polish/widget/modal.js
+- app/assets/javascripts/nail_polish/widget/stackable_modal.js
 - app/assets/javascripts/nail_polish.js
 - app/assets/javascripts/nail_polish_legacy_base.js
 - app/assets/javascripts/nail_polish_modern_base.js