Merge pull request #131 from VeliovGroup/dev

v1.6.2 - Fix issue with undefined Accounts variable. When using any of `accounts` packages, package `accounts-base` must be explicitly added to `.meteor/packages` above `ostrio:files` - Fix #127 - Avoid unlinking `original` file version twice - Fix issue described in #126 by @Dubbedge - Use backslashes on Windows - Allow to call `FilesCollection#remove()` method without arguments
veliovgroup · Jul 5, 2016 · fb61e78 · fb61e78
2 parents c427bab + b44d89d
commit fb61e78
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 61 deletions.
diff --git a/.versions b/.versions
@@ -26,7 +26,7 @@ [email protected]_1
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].1
+ostrio:[email protected].2
 [email protected]_1
 [email protected]
 [email protected]

diff --git a/README.md b/README.md
@@ -1,3 +1,10 @@
+[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FVDSXRFW9VGA2)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/VeliovGroup/Meteor-Files)
+[![GitHub issues](https://img.shields.io/github/issues/VeliovGroup/Meteor-Files.svg)](https://github.com/VeliovGroup/Meteor-Files/issues)
+[![GitHub forks](https://img.shields.io/github/forks/VeliovGroup/Meteor-Files.svg)](https://github.com/VeliovGroup/Meteor-Files/network)
+[![GitHub stars](https://img.shields.io/github/stars/VeliovGroup/Meteor-Files.svg)](https://github.com/VeliovGroup/Meteor-Files/stargazers)
+[![Twitter](https://img.shields.io/twitter/url/https/github.com/VeliovGroup/Meteor-Files.svg?style=social)](https://twitter.com/intent/tweet?url=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files)
+
 Files for Meteor
 ========
 Extremely fast and robust package for file uploading, managing and streaming (*Audio & Video & Images*), with support of server's file system (FS) or third party storage, like: *AWS*, *DropBox*, *Google Storage*, *Google Drive*, *GridFS* or any other with API.
@@ -8,11 +15,18 @@ For current upload *pause/continue*, *speed*, *remaining time* and *progress* se
 
 Support:
 ========
- - [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/VeliovGroup/Meteor-Files)
+ - [Ask a question via Gitter chat](https://gitter.im/VeliovGroup/Meteor-Files)
  - [Ask a question or submit an issue](https://github.com/VeliovGroup/Meteor-Files/issues)
  - [Releases / Changelog / History](https://github.com/VeliovGroup/Meteor-Files/releases)
  - For more docs and examples [read wiki](https://github.com/VeliovGroup/Meteor-Files/wiki)
 
+Support Meteor-Files project:
+========
+ - [Donate via PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FVDSXRFW9VGA2)
+ - Star on [GitHub](https://github.com/VeliovGroup/Meteor-Files)
+ - Stat on [Atmosphere](https://atmospherejs.com/ostrio/files)
+ - Share on [Facebook](https://www.facebook.com/sharer.php?u=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files) and [Twitter](https://twitter.com/share?url=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files)
+
 Awards:
 ========
 <a href="https://themeteorchef.com/blog/giant-cotton-apron-awards-show"><img src="https://s3.amazonaws.com/tmc-post-content/gcaa-2016-winner-badge.svg"></a>
@@ -54,6 +68,8 @@ meteor add ostrio:files
 
 API overview (*[full API](https://github.com/VeliovGroup/Meteor-Files/wiki)*)
 ========
+Note: When using any of `accounts` packages - package `accounts-base` must be explicitly added to `.meteor/packages` above `ostrio:files`
+
 #### `new FilesCollection([config])` [*Isomorphic*]
 Read full docs for [`FilesCollection` Constructor](https://github.com/VeliovGroup/Meteor-Files/wiki/Constructor)
 
@@ -254,12 +270,12 @@ For more expressive example see [Download demo](https://github.com/VeliovGroup/M
 
 Supporters:
 ========
-Big thanks to all supporters. *Only because of this guys this project can have 100% of our attention*.
+I would like to thank everyone who support this project. *Because of those guys this project can have 100% of our attention*.
  - [@themeteorchef](https://github.com/themeteorchef)
  - [@MeDBejoHok](https://github.com/medbejohok)
 
 ----
 
 | Meteor-Files | Expressive package to manage files within Meteor |
 |:-------------:|:------------- |
-| [![logo](https://raw.githubusercontent.com/VeliovGroup/Meteor-Files/master/logo.png)](https://github.com/VeliovGroup/Meteor-Files) | If you found this package useful, please do not hesitate to star it at both [GitHub](https://github.com/VeliovGroup/Meteor-Files) and [Atmosphere](https://atmospherejs.com/ostrio/files). Also you may like to [Tweet](https://twitter.com/share?url=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files&text=File%20upload%20and%20delivery%20in%20Meteorjs%20-%20now%20it's%20easy!) about it or share at [Facebook](https://www.facebook.com/sharer.php?u=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files) |
+| [![logo](https://raw.githubusercontent.com/VeliovGroup/Meteor-Files/master/logo-bw.png)](https://github.com/VeliovGroup/Meteor-Files) | If you found this package useful, please do not hesitate to star it at both [GitHub](https://github.com/VeliovGroup/Meteor-Files) and [Atmosphere](https://atmospherejs.com/ostrio/files). Also you may like to [Tweet](https://twitter.com/share?url=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files&text=File%20upload%20and%20delivery%20in%20Meteorjs%20-%20now%20it's%20easy!) about it or share at [Facebook](https://www.facebook.com/sharer.php?u=https%3A%2F%2Fgithub.com%2FVeliovGroup%2FMeteor-Files) <br /> [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=FVDSXRFW9VGA2) |
diff --git a/demo-simplest-download-button/.meteor/versions b/demo-simplest-download-button/.meteor/versions
@@ -55,7 +55,7 @@ [email protected]_1
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].2
 [email protected]_1
 raix:[email protected]
 [email protected]

diff --git a/demo-simplest-streaming/.meteor/versions b/demo-simplest-streaming/.meteor/versions
@@ -49,7 +49,7 @@ [email protected]_1
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].2
 [email protected]_1
 [email protected]
 [email protected]

diff --git a/demo-simplest-upload/.meteor/versions b/demo-simplest-upload/.meteor/versions
@@ -49,7 +49,7 @@ [email protected]_1
 [email protected]
 [email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].2
 ostrio:[email protected]
 [email protected]_1
 [email protected]

diff --git a/demo/.meteor/versions b/demo/.meteor/versions
@@ -67,7 +67,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]_1
-momentjs:moment@2.13.1
+momentjs:moment@2.14.1
 [email protected]_1
 [email protected]
 mquandalle:[email protected]
@@ -81,7 +81,7 @@ [email protected]
 [email protected]
 ostrio:[email protected]
 ostrio:[email protected]
-ostrio:[email protected].0
+ostrio:[email protected].2
 ostrio:[email protected]
 ostrio:[email protected]
 ostrio:[email protected]

diff --git a/demo/app.json b/demo/app.json
@@ -1,6 +1,6 @@
 {
   "name": "Meteor-Files-Demo",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Demo application for ostrio:files package",
   "repository": "https://github.com/VeliovGroup/Meteor-Files-Demo",
   "website": "https://github.com/VeliovGroup/Meteor-Files-Demo",

diff --git a/demo/client/file/file.coffee b/demo/client/file/file.coffee
@@ -9,21 +9,24 @@ Template.file.onCreated ->
 Template.file.onRendered ->
   @warning.set false
   @fetchedText.set false
-  if (@data.file.get('isText') or @data.file.get('isJSON'))
-    self = @
-    HTTP.call 'GET', @data.file.link(), (error, resp) ->
-      self.showPreview.set true
-      if error
-        console.error error
-      else
-        if !~[500, 404, 400].indexOf resp.statusCode
-          if resp.content.length < 1024 * 64
-            self.fetchedText.set resp.content
-          else
-            self.warning.set true
-      return
+  if @data.file.isText or @data.file.isJSON
+    if  @data.file.size < 1024 * 64
+      self = @
+      HTTP.call 'GET', @data.file.link(), (error, resp) ->
+        self.showPreview.set true
+        if error
+          console.error error
+        else
+          if !~[500, 404, 400].indexOf resp.statusCode
+            if resp.content.length < 1024 * 64
+              self.fetchedText.set resp.content
+            else
+              self.warning.set true
+        return
+    else
+      @warning.set true
 
-  else if @data.file.get('isImage')
+  else if @data.file.isImage
     self = @
     img  = new Image()
     img.onload = ->

diff --git a/demo/client/styles/styles.sass b/demo/client/styles/styles.sass
@@ -389,11 +389,13 @@ h1, h2, h3, h4, h5, h6, div, form, table, p
       img
         filter: grayscale(0%)
       i.fa-github
-        color: #fff
+        color: #999999
       i.fa-twitter
-        color: #00aced
+        color: #55acee
       i.fa-facebook-official
         color: #3b5998
+      i.fa-paypal
+        color: #009cde
 
 .block-info
   color: $text-color
@@ -670,6 +672,11 @@ button
       max-height: 50%
       max-width: 50% !important
 
+input.info-img
+  height: 32px
+  width: auto
+  margin: 0px 5px
+
 ._404
   text-align: center
   padding: 15px

diff --git a/demo/client/user-account/login.coffee b/demo/client/user-account/login.coffee
@@ -1,22 +1,11 @@
-Template.login.onCreated ->
-  self = @
-  @serviceConfiguration = new ReactiveVar {}
-  Meteor.call 'getServiceConfiguration', (error, serviceConfiguration) ->
-    if error
-      console.error error
-    else
-      self.serviceConfiguration.set serviceConfiguration
-    return
-  return
-
 Template.login.onRendered ->
   window.IS_RENDERED = true
   return
 
 Template.login.helpers
   unlist:               -> _app.unlist.get()
   secured:              -> _app.secured.get()
-  serviceConfiguration: -> Template.instance().serviceConfiguration.get()
+  serviceConfiguration: -> _app.serviceConfiguration.get()
 
 Template.login.events
   'click [data-login-meteor]': (e) ->

diff --git a/demo/lib/__compatability/__globals.coffee b/demo/lib/__compatability/__globals.coffee
@@ -19,6 +19,14 @@ if Meteor.isClient
   _app.currentUrl      = -> Meteor.absoluteUrl((FlowRouter.current().path or document.location.pathname).replace(/^\//g, '')).split('?')[0].split('#')[0].replace '!', ''
   _app.storeTTLUser    = 432000000
   _app.showProjectInfo = new ReactiveVar false
+
+  _app.serviceConfiguration = new ReactiveVar {}
+  Meteor.call 'getServiceConfiguration', (error, serviceConfiguration) ->
+    if error
+      console.error error
+    else
+      _app.serviceConfiguration.set serviceConfiguration
+    return
 
   Meteor.autorun ->
     ClientStorage.set 'blamed', _app.blamed.get()

diff --git a/demo/package.json b/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Meteor-Files-Demo",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "description": "Demo application for ostrio:files package",
   "main": "main.js",
   "scripts": {