corn_js 0.0.4 → 0.0.5

data/app/assets/javascripts/corn_js/corn.js

@@ -1,6 +1,6 @@
   var Popcorn = function($element, defaults) {
     this.$element = $element;
-    this.$anchor = null;
+    this.$anchor = this.$element;
     this.defaults =  defaults;
   };
 
@@ -15,12 +15,14 @@
 
   Popcorn.prototype.inferPositionType = function() {
     var self = this;
-    self.$anchor = self.$element;
-
+    this.$anchor = this.$element;
+    
     function _createPositionType(defaults) {
-      if(self.$element.offset().left < 1){
+
+      if(self.$element.offset().left < 1) {
           self.$anchor = self.$element.parent();
       }
+
       if (self.collideLeft()) { return new LeftPosition(self); }
       else if (self.collideRight()) { return new RightPosition(self); }
       return new CenterPosition(self);
@@ -111,25 +113,21 @@
 
   var FatPopcorn = function($element, defaults) {		
     function _checkOptions(options) {
+      if (!options.autoWrap) options.autoWrap = false;
+
       return typeof options.modelId === undefined || 
       options.token === undefined || 
-      options.current_user === undefined;
+      options.current_user === undefined;      
     };
     var self = this;
 
-    self.$element = $element;
+    if (_checkOptions(defaults)) throw("parameters [token], [current_user] are required");
 
+    self.$element = $element;
     self.defaults = defaults;
-    self.attributes = defaults;
-    this.get = function(option) {
-      return self.defaults[option];
-    }
-
-    self.defaults['modelName'] = self.$element.attr('data-model');
+    
 
-    if (_checkOptions(self.defaults)){
-      throw("parameters [modelId], [token], [current_user] are required");
-    }
+    self.defaults.modelName = "#"
   };
   FatPopcorn.prototype = new Popcorn();
   	
@@ -138,7 +136,7 @@
     this.setupFormToken();
     this.setupStreamUrl();
     this.setupHistoryUrl();
-    this.setupAttachmentsUrl();
+    this.setupEditForm();
     this.setupWatchlistUrl();
     
     if (this.hasStream()) {
@@ -152,9 +150,10 @@
   FatPopcorn.prototype.setupStreamUrl = function() {
     $('.fatpopcorn .stream').attr('data-url', this.streamUrl());
   };
-  FatPopcorn.prototype.setupAttachmentsUrl = function() {
+  FatPopcorn.prototype.setupEditForm = function() {
     FatPopcorn.createAttachmentButton(this.attachmentsUrl());
     $('.fatpopcorn .edit').attr('data-attach-url', this.attachmentsUrl());    
+    $('.on-off label.' + this.$element.attr('data-watching')).click();
   };
   FatPopcorn.prototype.setupWatchlistUrl = function() {
     $('.fatpopcorn .edit').attr('data-url', this.watchlistUrl());
@@ -185,13 +184,13 @@
     return this.urlPrefix() + '/histories';
   };
   FatPopcorn.prototype.urlPrefix = function() {
-    return '/active_metadata/' + this.get('modelName') + '/' + this.get('modelId') + '/' + this.currentLabel();
+    return '/active_metadata/' + this.$element.attr('data-model') + '/' + this.$element.attr('data-model-id') + '/' + this.$element.attr('data-label');
   };
   FatPopcorn.prototype.currentLabel = function() {
     return this.$element.attr('data-label');
   };
   FatPopcorn.prototype.hasStream = function() {
-    return this.$element.attr('data-stream') === 'true';
+    return parseInt(this.$element.attr('data-stream')) > 0;
   };
   FatPopcorn.hideContainer = function() {
     $(window).off('resize');
@@ -204,15 +203,16 @@
     return $('.fatpopcorn').first();
   }
   FatPopcorn.onCompleteUpload = function(id, fileName, response, qq) {
+      console.log('FatPopcorn.onCompleteUpload');
       if(qq.getQueue().length == 1) {
           $('.qq-upload-list').empty();                    
       }
-      if(!response.success){        
+      if(!response.success){
+        console.log(response);
           K.message.error(K.message.buildListOfErrors(response.errors));
           return;
       }
-
-      $('.stream-tab').click();
+      FatPopcorn.newNoteOrAttachmentSuccess(response);
   }
   FatPopcorn.decorateContainerWithHtml = function() {
     var self = this;
@@ -303,10 +303,11 @@
     function _stopWatching() {
       _callWatchlistService({_method: 'delete', authenticity_token: FatPopcorn.formToken() });
     };
-    function _callWatchlistService(data) {      
-      $.post($('.fatpopcorn .edit').attr('data-url'), data).success(function() {console.log("watchlist success")});
+    function _callWatchlistService(data) {
+      var url = $('.fatpopcorn .edit').attr('data-url');
+
+      $.post(url, data, {dataType: 'script'}).done(FatPopcorn.watchingServiceSuccess).error(FatPopcorn.watchingServiceFail);
     };
-    
     $('.fatpopcorn').on('click', function(e) {
       e.stopPropagation();
     });
@@ -320,20 +321,58 @@
     $('#send_note').click(function() {
       if ($('#note_text').val() == '') return false;
 
-      $.post($('form#notes_form').attr('action'), $('form#notes_form').serialize()).success('success.rails', FatPopcorn.newNoteSuccess);
+      $.post($('form#notes_form').attr('action'), $('form#notes_form').serialize())
+        .success('success.rails', FatPopcorn.newNoteOrAttachmentSuccess)
+        .fail(function(e){console.log('request failed')});
     });
     $('.loader').ajaxSend(function(e) { $(this).show(); });
     $('.loader').ajaxComplete(function() { $(this).hide(); });
   };
 
-  FatPopcorn.newNoteSuccess = function(data) {   
+  /* ajax callbacks */
+  FatPopcorn.watchingServiceSuccess = function(jqxhr) {    
+    var data = eval(jqxhr);
+    FatPopcorn.item(data).attr('data-watching', data.watching);
+  }
+  FatPopcorn.watchingServiceFail = function(data) {
+    console.log('Watchlist service request failed');
+    console.log(data);
+    console.log(data.state());
+    console.log(data.statusCode());
+    console.log(data.getAllResponseHeaders());
+    
+  }
+
+  FatPopcorn.item = function(data) {
+    return $('[data-model="' + data.modelName + '"][data-label="' + data.fieldName + '"]');
+  }
+
+  FatPopcorn.newNoteOrAttachmentSuccess = function(dataString) {
+    var data = eval(dataString)
+    FatPopcorn.item(data).attr('data-stream', data.streamItemsCount);
+    
+    if (data.streamItemsCount > 0) {
+      FatPopcorn.item(data).parents('.fatpopcorn_grip').addClass('has-stream');
+      FatPopcorn.item(data).siblings('.stream-items-count').text(data.streamItemsCount);
+      if (data.streamItemsCount > 9)
+        FatPopcorn.item(data).siblings('.stream-items-count').addClass('two-digits')
+      else
+        FatPopcorn.item(data).siblings('.stream-items-count').removeClass('two-digits')
+    } else {
+      FatPopcorn.item(data).parents('.fatpopcorn_grip').removeClass('has-stream');
+      FatPopcorn.item(data).siblings('.stream-items-count').empty();
+    }
     $('.fatpopcorn textarea#note_text').val('');
-    $('.fatpopcorn .stream-tab').click();
+    $('.fatpopcorn .active').removeClass('active');
+    $('.fatpopcorn .popcorn-body > div:not(.header)').hide();
+    $(".fatpopcorn .stream").show();
+    $(".fatpopcorn .stream-tab").addClass('active');
+    FatPopcorn.getStreamSuccess(data.streamBody);
+
   };
 
-  FatPopcorn.getStreamSuccess = function(data) { 
-    $('.fatpopcorn .stream .content').empty();
-    $('.fatpopcorn .stream .content').append(data);    
+  FatPopcorn.getStreamSuccess = function(data) {
+    $('.fatpopcorn .stream .content').html(data);
     $('.fatpopcorn .stream .attachment span.delete').click(FatPopcorn.deleteAttachment);
     $('.fatpopcorn .stream .note span.delete').click(FatPopcorn.deleteNote);
   };
@@ -349,15 +388,13 @@
     }
 
     $.post(_url(), {_method: 'delete'}).    
-      success('success.rails', FatPopcorn.deleteSuccess).
+      success('success.rails', FatPopcorn.newNoteOrAttachmentSuccess).
       fail(FatPopcorn.deleteFailure);
   };
   FatPopcorn.deleteSuccess = function() {
     $('.fatpopcorn .stream-tab').click();
-    console.log('deleted attach success');
   };
   FatPopcorn.deleteFailure = function() {
-    console.log('deleted attach failure');
   };
   FatPopcorn.getHistorySuccess = function(data) { 
     $('.fatpopcorn .history .content').empty();
@@ -394,7 +431,11 @@
         $(e.target).data('elementMatched', true);   
       });
 
-      fatpopcorn.gripOf($element).click(function(e) {
+      $('.fatpopcorn_grip .stream-items-count').click(function(e) {
+        $(e.target).data('elementMatched', false);
+      });
+
+      fatpopcorn.gripOf($element).click(function(e) {        
         if ($(e.target).data('elementMatched')) return;
 
         e.stopPropagation();

data/app/assets/stylesheets/corn_js/corn.css

@@ -41,9 +41,32 @@ a:hover {
   width: 160px;
   margin-top: 4px;
 }
+.fatpopcorn_grip {
+  background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAZ1JREFUeNqkU0tLAlEUPvc6YiKChOBjNwsLZhEjuCsZ8Ae0ausigvob/Y0ioa0QSK1cKgaROK5spAfD7ESFEMHnYuyc4d4yqBzog2/uuXPv9537OJetViuQqNfr1OjII2QeuY90kffIBrJsGIYFa2Bk0Gq1vM5kMrnC5gT+QCaTeUyn0+eoqeZyuS8DFN/i+CHnHFKpFMTjcYjFYp5oNBrBYDCAYDAIqqoCalzGGK2yoojMFyQOhUKgaRpEIhEIBAKfWckoGo0Cirz+crnk3W63oOt6hdVqNQ3/PdFgNpv1Jm5Cs9mE2Wz2juEex0+RfiaTSQiHw+AHIsk2abk4bUgkEqAoii8DmiuQJ4Ndimj/frE2d4fDP0EGr+JkfYsWi4UMX7ioMu+e/WI4HMqwQQZlinq9HtXDRvF4PIZ+vy+7Nxxr28Sg5LoudDodut9fxZTAsiwQ7+cS+SYP8RRZnc/nYJomOI4DFEtMp1OwbRva7bbc/x1W69m3x4TuW8K1uGEX1yg+litiPzxnQ7zIA6Qqhp7FYZeQD+tuHwIMACccpgPnIZ+qAAAAAElFTkSuQmCC") no-repeat scroll 100% 4px;
+  cursor: pointer;
+}
+.fatpopcorn_grip.has-stream {
+  background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAZlJREFUeNqkU08og2Ecfr7XZDT5k5YkTGuKEhcttoYcHMSB3HbA2Q5OjnJydiOr5aa2FqV2cDJhQi6U0Yq0tJBNIvF9fu/3vmw72L7y1PP2/vk9z/vv91M0TcMvQj7edhEniG5iH1El7hGjxA2ML18gB4pusLMkRunkGrUzKITuyRhaXQukiWBoPscgndyk5VEwE2DrBRrpIHV2IUrFgbtToMwCdIwAmqpCYfyUYZPceUUXl1cDzmmgsh4oNWd3tTqAmiagRITjPcNwtD4Ijy+saMHZdpo6J0dgYE4EFkNkEXh9eKJeJ6ng1SdbnIDFCkMQm9RyLZOvDTT35B+7EHisgJsbtOldfn+jyMY6GP4JbnCl996ejauysXEms4z++cy4Ac8JgSjT05MjQT6Z++LixwRwe/wzCjLK7RPq+KF+AvurwEvqbzHfIBbgmchHFIxrkcohHz/JNnFY/0p7v8iLiloh5KY3hxS+C3x98JktVDWMUQbn1YJZunqLXCJA4ilZAtIgv5w9siJdRJtcuZSP7Sce5Lp9CzAAUF99tEicER0AAAAASUVORK5CYII=") no-repeat scroll 100% 4px;
+  cursor: pointer;
+}
 .fatpopcorn_grip:hover {
-  background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAcpJREFUeNqUU02rgVEQft73ykJJkixkI99+gYWFJCt+gGQnNvyGu7KwJMrCRpbWJFlIWStfiY0sKF/ZSp1rprhX93V1nzrNnM48z5yZM0cSQkAJ5/NZTKdT9j0eD3Q6naQUp3pFzmazOJ1OvNfr9SgUCkJJRFYSqNVqTPb5fLzIr9frijf9JbBarUSn04Esy0gkEojH4+y3221sNhuhWEKv1+N6F4sFlsslH4TDYZjNZvYDgQC63S5SqRRsNptwOp3cF7/fL30YDAZB1yPi8XhkgsPhQDqdhkaj4b3dbsdoNOJSKIYSDQYD7Pf7TykSiQiVSoVkMsmBtwz4C5RoPp+jWq3ier1CDoVC7IzHY1itVrwDxVC5xCGuHIvFoNVq0e/3UalU3gpQDMUSh7jyrQdSLpfjw1arhUaj8ZI8HA7pJWA0GkEc4oImkVaz2RTUj3K5LP6B7znY7XZsSf0/eAhst1u2JpOJ7eFw4HppkU+g2qPRKPL5PG2lp7+gVqvZXi4XlEolHhzqNIGmMBgMwuVyPcWyyv033sZXFIvFp+vdJu2R+ScymQw9ofQkcBeZTCZwu908qhaLhYPW6zWP+mw2g9frfZAJXwIMABU5CfhlmG8GAAAAAElFTkSuQmCC") no-repeat scroll 100% 4px;
-  
+  background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAbpJREFUeNqkkz9IAnEUx593BuLgkIKDgwRaEBLtl8UNYou2tB4YDU7uQtDipmNTkdAqBJGYDg4Ol9QSgVDan0VBXSQ3B9G7vu+4A4nCg77w8fe93/3e4/m79xy6rpOlZDLJyzY4BFEgAQ3cAxWUyuXyKy1I4J9MJmMAXYJncAJ2gQhWgAxOwUu1Wn3Eum+eJwdXwA/dbveWi3A6nRSPx0mSJIpEIsahVqtFqqqSx+MhRVFoPp9roihylTfECRKJxDnQU6mU3ul09Mlkov8U702nU8OPRiM9m82ecawDgZtcmiAIVCgUKBwO0zKl02kaDodfsFt8BwpvxmIxCgQCZEehUIiXVY4VzNsmWZbJ7XbbSsBnTUU5wQY7r9dLduXz+Sy7LtA/xQk+2IzHY9tB+AqWfRfMLjO+s101m03LqpygxK5Wq1Gv11sa3G63qdFoWI/XAnr7CaY4m80ol8vRYDD4MxjdSvl8njSNx4MuwKfRyhgiruSOe9zlchlDxX3h9/uNwH6/T/V6nSqVCqEbeascDAYPOOHiLLjMrMqSf3GF4COrIscv47wHjsEOWDNfvZmXXQQPi9m+BRgAEy7Bz0TDHpwAAAAASUVORK5CYII=") no-repeat scroll 100% 4px;
+}
+.fatpopcorn_grip.has-stream:hover {
+  background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdJJREFUeNpi/P//PwMMfCsVAVEGQBwCxLZAbA3E/4D4CBAfBuKVXN1vrjEgASYQ8aPPDoyBYA4QnwfiaiAGCTADMSsQOwJxHRBf/XN8/gkg7QFVz8AIcgGI8+/5tY1Avh8jCxsDs3kcA4u+PwOToiVY0d87hxn+XlzPwMgtwsDqUQV0099/DEzMIFeuZwAZ8LVEeCYQ///WrPP/78Mz/////PIfA4DE/vwCM/99fP7/x3TfySC9jECNWiCnMTCzMHBkb2dgkjVkIAR+dJoy/Htz/x2QqQcKg1iQIItpFAOjqAoDMYBJBhTODEIgvUzQ0GZgMQ5nYOTgJcoAZqMwGNMWZIA6ODT5JRmIBYwC0jCmGhMDhQBkwG0Q4/+nl0Rr+v/hKYx5iwmayhj+XFhPtAF/L2+CMQ+DDFgJFjyxgOHfixsENf97eJrhz7nVMO4aJmDaPgtkzAUmEoZfC6IZ/r+5h1sz0IKfi5OAtv0BcWcB8R1wUgZmIpBLtoLSOCMHDwOLTToDi1k0A6OgHMTPr+8w/Dm9jOHPkVkM/3//AAltYpLU8gcmf5S8wAE1NZaALxYANSeCXQQzAC072wNxMhDbALEiVOomNLDnAvFxZNMAAgwACr3G5lMadUAAAAAASUVORK5CYII=") no-repeat scroll 100% 4px;  
+}
+.fatpopcorn_grip .stream-items-count {
+  font: 8px Verdana, Arial, sans-serif;
+  color: #f56a00;
+  float: right;
+  font-size: 8px;    
+  margin-right: 5px;
+  margin-top: 6px;
+  font-weight: bold;
+  text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0;
+}
+.fatpopcorn_grip .stream-items-count.two-digits {
+  margin-right: 3px;  
 }
 
 /* generic classes */
@@ -56,7 +79,6 @@ a:hover {
 }
 .fatpopcorn h1 {
   font: bold 12px/14px "Segoe UI","Lucida Grande",Arial,sans-serif;
-
   margin: 12px 0 4px 0;
   padding-left: 15px;
   font-size: 12px;
@@ -65,7 +87,6 @@ a:hover {
 .fatpopcorn .watchlist h1 {
   background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAbZJREFUeNpMUjtrmmEUfj4/b4NQlA8cFAshqAiKDkqgVTInCJkSCIE0m0sG/0RA+hccajKGLtKukkI2RSoFL4ilRRfxMqigeM1zXiJ4lpdze87znPNq6XQa7+ba7XaXi8XifLVafaa/tVqtrzab7Yemad/pj6VIe2842mw233RdT8ZiMQQCAYXQarVQrVax3W5/MfeFoX/SYKzX62en03mayWQQj8fBJAaDARhHu91GPp/HZDL5yfi17vf7bzjyPpvNIplMwmw2I5fLwW63g3F4vV643W6Uy2U//d+m0Wh0EQ6HkUgk9loUsslkAmliOBzC5/MhEolguVxemQuFwicKU8iHZrFYQNHgItQ0wzAEIKyqZPShiYZGowGHw6EaXC6XmqpylUrldDweH6dSKVUoNDganU4H0+lUxGI+n6PX6wm9Fz0ajX7o9/tnFA+Px4Nut6vohUIhBINBiD7qRKlUEsCvOnf+n6gn9Xr9o3AV27+z2Qy1Wg3FYhE86AsX8bA/3DGbnoh8IsiyRuHOyWg2m+DlX4l+y7q/2sHXMFh0R/6XbA7J1yDAH27rmUt5pD+SojcBBgBCW8Ar7p88wQAAAABJRU5ErkJggg==") no-repeat scroll 0 2px;
 }
-
 .fatpopcorn .attachment h1 {
   background: transparent url("data:image/png;charset=utf-8;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABh0RVh0Q3JlYXRpb24gVGltZQAxMS0wMS0yMDEytcl2IgAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNXG14zYAAADESURBVCiRfdAhcgJBEAXQtywCVHIEZGQcOLhByA1WEscRkMjIyI1DIpEcYeMikUjiggJBDzW1lc2vmprpqf/7/+5CN5aY4QE/OGDV6yDXuGCPIu66S1CjwWt0nWEUZ1q2yO844glbbOJ/gm8Mcocq8o6yCMnxhBU+i4w8beXN483dltCUGfkLA6yDvIx6jkUIpRnOGOMtcxxjGHPsUu4+HvESW/kv3h2HECU8B6lqE/NIDX7jvY764y9B6rgN+73bkJ24AvtdK0qIEWRDAAAAAElFTkSuQmCC") no-repeat scroll 0 2px;
 }
@@ -321,10 +342,11 @@ div > h1 > span.delete:hover {
 }
 .fatpopcorn .content .no-content {
   position:absolute;
-  top:50%;
-  font-size: 20px;
+  top:46%;
+  left: 10px;
+  font-size: 22px;
   color: #ccc;
-  background:transparent;
+  background-color: #ffffff !important;
   text-shadow: rgba(0, 0, 0, 0.3) 0 -1px 0;
 }
 .fatpopcorn .loader {

data/lib/corn_js/version.rb

@@ -1,3 +1,3 @@
 module CornJs
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corn_js
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164538140 !ruby/object:Gem::Requirement
+  requirement: &2166204740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164538140
+  version_requirements: *2166204740
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2164537460 !ruby/object:Gem::Requirement
+  requirement: &2166204320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164537460
+  version_requirements: *2166204320
 description: It's possible to use the generic popcorn and the app specific fat popcorn
   plugin
 email:
@@ -69,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -582293340183790761
+      hash: -3416024969603645718
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -582293340183790761
+      hash: -3416024969603645718
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10