adminpanel 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9021b26582599b25784424c0ccf153525ac6bab7
-  data.tar.gz: 0f71842ba2dfa555b2e69b2bff447ba548ba39ae
+  metadata.gz: 7ba1a18640675f498cd05c8446d75845f5d9a697
+  data.tar.gz: 83fd84d421a3de764a2538bb2458ef22e74566fe
 SHA512:
-  metadata.gz: 2d32120a47905223d4092f399c0f3b2b88b4bc55bbc736e7900cff51b04eae627de0d6f2623ed6243adf6590193a02c9adcad90374e67acb9f2b3e0a79368038
-  data.tar.gz: b241bc313fad64da43882fbda6a6825f58f38e15626dad3fe99901c1af0fd83e5de64f4de6cb04ccea9b7e39828591bbec45b191c816d8a901990dbea5aa794b
+  metadata.gz: 996b5de93dba5b3589ebe2bcb236e276cefff019998fff3840f5441329b4d48b4f5a6d8bfdec84d18217150b16be58703a2ffd9b0947729f979eca34d0e622fd
+  data.tar.gz: 81a51d9fad96282b872568142308ee32b2b86fd1e3bd367e8074c61f2f60eabda7cfd70b67ff12547aa6dc12474bafef5fb04f65ab68679062813d666afdb226

data/.gitignore

@@ -27,3 +27,4 @@
 Gemfile.lock
 .ruby-version
 .ruby-gemset
+.DS_Store

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 
 rvm:
-  - 2.1
+  - 2.2.3
 
 sudo: false
 
 cache: bundler
 
 env:
-  - RAILS=4.2.0
-  - RAILS=4.2.4
+  - RAILS=5.0.0.1

data/Gemfile

@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec development_group: :test
+gemspec

data/adminpanel.gemspec

@@ -19,11 +19,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib', 'app/assets']
 
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = '>= 2.2.3'
 
   spec.requirements  << 'imagemagick installed'
 
-  spec.add_runtime_dependency 'rails',       '>= 4.2.0', '< 5.0.0'
+  spec.add_runtime_dependency 'rails',       '>= 5.0', '< 5.1'
   spec.add_runtime_dependency 'mini_magick', '4.3.6'
   spec.add_runtime_dependency 'bcrypt',      '~> 3.1',   '>= 3.1.7'
   spec.add_runtime_dependency 'carrierwave', '~> 0.10',  '>= 0.10.0'
@@ -38,21 +38,22 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'twitter',           '5.14.0' # Twitter
 
   # Asset dependencies
-  spec.add_runtime_dependency 'coffee-rails',       '~> 4.1.0', '>= 4.1.0'
+  spec.add_runtime_dependency 'coffee-rails',       '~> 4.2', '>= 4.2.0'
   spec.add_runtime_dependency 'font-awesome-rails', '~> 4.2',   '>= 4.2.0'
-  spec.add_runtime_dependency 'jquery-rails',       '~> 4.0.4', '>= 4.0.4'
+  spec.add_runtime_dependency 'jquery-rails',       '~> 4.2', '>= 4.2.0'
   spec.add_runtime_dependency 'jquery-ui-rails',    '~> 5.0.5', '>= 5.0.5'
   spec.add_runtime_dependency 'sass-rails',         '~> 5.0.0', '>= 5.0.0'
-  spec.add_runtime_dependency 'turbolinks',         '~> 2.5.0', '>= 2.5.2'
+  spec.add_runtime_dependency 'turbolinks',         '~> 5', '>= 5'
 
   # Development dependencies
   spec.add_runtime_dependency 'faker', '~> 1.3',   '>= 1.3.0'
 
   # Test dependencies
-  spec.add_development_dependency 'minitest',         '>= 5.4.0', '<= 6.0.0'
+  spec.add_development_dependency 'minitest',         '>= 5.7.0', '<= 6.0.0'
   spec.add_development_dependency 'minitest-emoji',   '2.0.0'
+  spec.add_development_dependency 'capybara',         '> 2.10.0'
   spec.add_development_dependency 'minitest-capybara','0.7.1'
   spec.add_development_dependency 'poltergeist'
-  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '>= 1.3.10'
+  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '>= 1.3.12'
   spec.add_development_dependency 'byebug'
 end

data/app/assets/javascripts/adminpanel/application.js

@@ -19,5 +19,3 @@
 //= require turbolinks
 //= require adminpanel/bootstrap
 //= require_tree .
-Turbolinks.enableTransitionCache();
-Turbolinks.enableProgressBar();

data/app/assets/javascripts/adminpanel/dropzone.js

@@ -111,7 +111,7 @@
         dropzone.on("dragEnter", function() { });
      */
 
-    Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "addedfile", "removedfile", "thumbnail", "error", "errormultiple", "processing", "processingmultiple", "uploadprogress", "totaluploadprogress", "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple", "complete", "completemultiple", "reset", "maxfilesexceeded", "maxfilesreached", "queuecomplete"];
+    Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "addedfile", "addedfiles", "removedfile", "thumbnail", "error", "errormultiple", "processing", "processingmultiple", "uploadprogress", "totaluploadprogress", "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple", "complete", "completemultiple", "reset", "maxfilesexceeded", "maxfilesreached", "queuecomplete"];
 
     Dropzone.prototype.defaultOptions = {
       url: null,
@@ -127,7 +127,6 @@
       thumbnailHeight: 120,
       filesizeBase: 1000,
       maxFiles: null,
-      filesizeBase: 1000,
       params: {},
       clickable: true,
       ignoreHiddenFiles: true,
@@ -137,7 +136,9 @@
       autoQueue: true,
       addRemoveLinks: false,
       previewsContainer: null,
+      hiddenInputContainer: "body",
       capture: null,
+      renameFilename: null,
       dictDefaultMessage: "Drop files here to upload",
       dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
       dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
@@ -174,7 +175,11 @@
         }
         span = messageElement.getElementsByTagName("span")[0];
         if (span) {
-          span.textContent = this.options.dictFallbackMessage;
+          if (span.textContent != null) {
+            span.textContent = this.options.dictFallbackMessage;
+          } else if (span.innerText != null) {
+            span.innerText = this.options.dictFallbackMessage;
+          }
         }
         return this.element.appendChild(this.getFallbackForm());
       },
@@ -255,7 +260,7 @@
           _ref = file.previewElement.querySelectorAll("[data-dz-name]");
           for (_i = 0, _len = _ref.length; _i < _len; _i++) {
             node = _ref[_i];
-            node.textContent = file.name;
+            node.textContent = this._renameFilename(file.name);
           }
           _ref1 = file.previewElement.querySelectorAll("[data-dz-size]");
           for (_j = 0, _len1 = _ref1.length; _j < _len1; _j++) {
@@ -387,6 +392,7 @@
       maxfilesexceeded: noop,
       maxfilesreached: noop,
       queuecomplete: noop,
+      addedfiles: noop,
       previewTemplate: "<div class=\"dz-preview dz-file-preview\">\n  <div class=\"dz-image\"><img data-dz-thumbnail /></div>\n  <div class=\"dz-details\">\n    <div class=\"dz-size\"><span data-dz-size></span></div>\n    <div class=\"dz-filename\"><span data-dz-name></span></div>\n  </div>\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress></span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n  <div class=\"dz-success-mark\">\n    <svg width=\"54px\" height=\"54px\" viewBox=\"0 0 54 54\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\">\n      <title>Check</title>\n      <defs></defs>\n      <g id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\">\n        <path d=\"M23.5,31.8431458 L17.5852419,25.9283877 C16.0248253,24.3679711 13.4910294,24.366835 11.9289322,25.9289322 C10.3700136,27.4878508 10.3665912,30.0234455 11.9283877,31.5852419 L20.4147581,40.0716123 C20.5133999,40.1702541 20.6159315,40.2626649 20.7218615,40.3488435 C22.2835669,41.8725651 24.794234,41.8626202 26.3461564,40.3106978 L43.3106978,23.3461564 C44.8771021,21.7797521 44.8758057,19.2483887 43.3137085,17.6862915 C41.7547899,16.1273729 39.2176035,16.1255422 37.6538436,17.6893022 L23.5,31.8431458 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z\" id=\"Oval-2\" stroke-opacity=\"0.198794158\" stroke=\"#747474\" fill-opacity=\"0.816519475\" fill=\"#FFFFFF\" sketch:type=\"MSShapeGroup\"></path>\n      </g>\n    </svg>\n  </div>\n  <div class=\"dz-error-mark\">\n    <svg width=\"54px\" height=\"54px\" viewBox=\"0 0 54 54\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:sketch=\"http://www.bohemiancoding.com/sketch/ns\">\n      <title>Error</title>\n      <defs></defs>\n      <g id=\"Page-1\" stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\" sketch:type=\"MSPage\">\n        <g id=\"Check-+-Oval-2\" sketch:type=\"MSLayerGroup\" stroke=\"#747474\" stroke-opacity=\"0.198794158\" fill=\"#FFFFFF\" fill-opacity=\"0.816519475\">\n          <path d=\"M32.6568542,29 L38.3106978,23.3461564 C39.8771021,21.7797521 39.8758057,19.2483887 38.3137085,17.6862915 C36.7547899,16.1273729 34.2176035,16.1255422 32.6538436,17.6893022 L27,23.3431458 L21.3461564,17.6893022 C19.7823965,16.1255422 17.2452101,16.1273729 15.6862915,17.6862915 C14.1241943,19.2483887 14.1228979,21.7797521 15.6893022,23.3461564 L21.3431458,29 L15.6893022,34.6538436 C14.1228979,36.2202479 14.1241943,38.7516113 15.6862915,40.3137085 C17.2452101,41.8726271 19.7823965,41.8744578 21.3461564,40.3106978 L27,34.6568542 L32.6538436,40.3106978 C34.2176035,41.8744578 36.7547899,41.8726271 38.3137085,40.3137085 C39.8758057,38.7516113 39.8771021,36.2202479 38.3106978,34.6538436 L32.6568542,29 Z M27,53 C41.3594035,53 53,41.3594035 53,27 C53,12.6405965 41.3594035,1 27,1 C12.6405965,1 1,12.6405965 1,27 C1,41.3594035 12.6405965,53 27,53 Z\" id=\"Oval-2\" sketch:type=\"MSShapeGroup\"></path>\n        </g>\n      </g>\n    </svg>\n  </div>\n</div>"
     };
 
@@ -508,6 +514,10 @@
       return this.getFilesWithStatus(Dropzone.UPLOADING);
     };
 
+    Dropzone.prototype.getAddedFiles = function() {
+      return this.getFilesWithStatus(Dropzone.ADDED);
+    };
+
     Dropzone.prototype.getActiveFiles = function() {
       var file, _i, _len, _ref, _results;
       _ref = this.files;
@@ -533,7 +543,7 @@
         setupHiddenFileInput = (function(_this) {
           return function() {
             if (_this.hiddenFileInput) {
-              document.body.removeChild(_this.hiddenFileInput);
+              _this.hiddenFileInput.parentNode.removeChild(_this.hiddenFileInput);
             }
             _this.hiddenFileInput = document.createElement("input");
             _this.hiddenFileInput.setAttribute("type", "file");
@@ -553,7 +563,7 @@
             _this.hiddenFileInput.style.left = "0";
             _this.hiddenFileInput.style.height = "0";
             _this.hiddenFileInput.style.width = "0";
-            document.body.appendChild(_this.hiddenFileInput);
+            document.querySelector(_this.options.hiddenInputContainer).appendChild(_this.hiddenFileInput);
             return _this.hiddenFileInput.addEventListener("change", function() {
               var file, files, _i, _len;
               files = _this.hiddenFileInput.files;
@@ -563,6 +573,7 @@
                   _this.addFile(file);
                 }
               }
+              _this.emit("addedfiles", files);
               return setupHiddenFileInput();
             });
           };
@@ -592,7 +603,7 @@
       })(this));
       this.on("complete", (function(_this) {
         return function(file) {
-          if (_this.getUploadingFiles().length === 0 && _this.getQueuedFiles().length === 0) {
+          if (_this.getAddedFiles().length === 0 && _this.getUploadingFiles().length === 0 && _this.getQueuedFiles().length === 0) {
             return setTimeout((function() {
               return _this.emit("queuecomplete");
             }), 0);
@@ -659,8 +670,9 @@
             events: {
               "click": function(evt) {
                 if ((clickableElement !== _this.element) || (evt.target === _this.element || Dropzone.elementInside(evt.target, _this.element.querySelector(".dz-message")))) {
-                  return _this.hiddenFileInput.click();
+                  _this.hiddenFileInput.click();
                 }
+                return true;
               }
             }
           });
@@ -709,6 +721,13 @@
       }
     };
 
+    Dropzone.prototype._renameFilename = function(name) {
+      if (typeof this.options.renameFilename !== "function") {
+        return name;
+      }
+      return this.options.renameFilename(name);
+    };
+
     Dropzone.prototype.getFallbackForm = function() {
       var existingFallback, fields, fieldsString, form;
       if (existingFallback = this.getExistingFallback()) {
@@ -814,18 +833,21 @@
 
     Dropzone.prototype.filesize = function(size) {
       var cutoff, i, selectedSize, selectedUnit, unit, units, _i, _len;
-      units = ['TB', 'GB', 'MB', 'KB', 'b'];
-      selectedSize = selectedUnit = null;
-      for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
-        unit = units[i];
-        cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
-        if (size >= cutoff) {
-          selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
-          selectedUnit = unit;
-          break;
+      selectedSize = 0;
+      selectedUnit = "b";
+      if (size > 0) {
+        units = ['TB', 'GB', 'MB', 'KB', 'b'];
+        for (i = _i = 0, _len = units.length; _i < _len; i = ++_i) {
+          unit = units[i];
+          cutoff = Math.pow(this.options.filesizeBase, 4 - i) / 10;
+          if (size >= cutoff) {
+            selectedSize = size / Math.pow(this.options.filesizeBase, 4 - i);
+            selectedUnit = unit;
+            break;
+          }
         }
+        selectedSize = Math.round(10 * selectedSize) / 10;
       }
-      selectedSize = Math.round(10 * selectedSize) / 10;
       return "<strong>" + selectedSize + "</strong> " + selectedUnit;
     };
 
@@ -847,6 +869,7 @@
       }
       this.emit("drop", e);
       files = e.dataTransfer.files;
+      this.emit("addedfiles", files);
       if (files.length) {
         items = e.dataTransfer.items;
         if (items && items.length && (items[0].webkitGetAsEntry != null)) {
@@ -906,30 +929,37 @@
     };
 
     Dropzone.prototype._addFilesFromDirectory = function(directory, path) {
-      var dirReader, entriesReader;
+      var dirReader, errorHandler, readEntries;
       dirReader = directory.createReader();
-      entriesReader = (function(_this) {
-        return function(entries) {
-          var entry, _i, _len;
-          for (_i = 0, _len = entries.length; _i < _len; _i++) {
-            entry = entries[_i];
-            if (entry.isFile) {
-              entry.file(function(file) {
-                if (_this.options.ignoreHiddenFiles && file.name.substring(0, 1) === '.') {
-                  return;
+      errorHandler = function(error) {
+        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
+      };
+      readEntries = (function(_this) {
+        return function() {
+          return dirReader.readEntries(function(entries) {
+            var entry, _i, _len;
+            if (entries.length > 0) {
+              for (_i = 0, _len = entries.length; _i < _len; _i++) {
+                entry = entries[_i];
+                if (entry.isFile) {
+                  entry.file(function(file) {
+                    if (_this.options.ignoreHiddenFiles && file.name.substring(0, 1) === '.') {
+                      return;
+                    }
+                    file.fullPath = "" + path + "/" + file.name;
+                    return _this.addFile(file);
+                  });
+                } else if (entry.isDirectory) {
+                  _this._addFilesFromDirectory(entry, "" + path + "/" + entry.name);
                 }
-                file.fullPath = "" + path + "/" + file.name;
-                return _this.addFile(file);
-              });
-            } else if (entry.isDirectory) {
-              _this._addFilesFromDirectory(entry, "" + path + "/" + entry.name);
+              }
+              readEntries();
             }
-          }
+            return null;
+          }, errorHandler);
         };
       })(this);
-      return dirReader.readEntries(entriesReader, function(error) {
-        return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log(error) : void 0 : void 0;
-      });
+      return readEntries();
     };
 
     Dropzone.prototype.accept = function(file, done) {
@@ -1067,9 +1097,12 @@
       return fileReader.readAsDataURL(file);
     };
 
-    Dropzone.prototype.createThumbnailFromUrl = function(file, imageUrl, callback) {
+    Dropzone.prototype.createThumbnailFromUrl = function(file, imageUrl, callback, crossOrigin) {
       var img;
       img = document.createElement("img");
+      if (crossOrigin) {
+        img.crossOrigin = crossOrigin;
+      }
       img.onload = (function(_this) {
         return function() {
           var canvas, ctx, resizeInfo, thumbnail, _ref, _ref1, _ref2, _ref3;
@@ -1305,7 +1338,9 @@
       }
       for (headerName in headers) {
         headerValue = headers[headerName];
-        xhr.setRequestHeader(headerName, headerValue);
+        if (headerValue) {
+          xhr.setRequestHeader(headerName, headerValue);
+        }
       }
       formData = new FormData();
       if (this.options.params) {
@@ -1342,8 +1377,12 @@
         }
       }
       for (i = _m = 0, _ref5 = files.length - 1; 0 <= _ref5 ? _m <= _ref5 : _m >= _ref5; i = 0 <= _ref5 ? ++_m : --_m) {
-        formData.append(this._getParamName(i), files[i], files[i].name);
+        formData.append(this._getParamName(i), files[i], this._renameFilename(files[i].name));
       }
+      return this.submitRequest(xhr, formData, files);
+    };
+
+    Dropzone.prototype.submitRequest = function(xhr, formData, files) {
       return xhr.send(formData);
     };
 
@@ -1385,7 +1424,7 @@
 
   })(Emitter);
 
-  Dropzone.version = "4.0.1";
+  Dropzone.version = "4.3.0";
 
   Dropzone.options = {};
 
@@ -1725,4 +1764,4 @@
 
   contentLoaded(window, Dropzone._autoDiscoverFunction);
 
-}).call(this);
+}).call(this);

data/app/assets/javascripts/adminpanel/filter-side-menu.coffee

@@ -1,4 +1,4 @@
-$(document).on 'page:load ready', ->
+$(document).on 'turbolinks:load', ->
   $('#search-modules').domFilter
     input: '#search-input'
     selector: '.accordion-group'

data/app/assets/javascripts/adminpanel/gallery.js.coffee.erb

@@ -76,4 +76,4 @@ DropzoneHandler =
 
 
 
-$(document).on('page:load ready', $.proxy(DropzoneHandler.init, DropzoneHandler))
+$(document).on('turbolinks:load', $.proxy(DropzoneHandler.init, DropzoneHandler))

data/app/assets/javascripts/adminpanel/google_analytics_chart.js.coffee

@@ -1,5 +1,4 @@
-drawGraphic = ->
-
+$(document).on 'turbolinks:load', ->
   if $('#google-stats').length
     margin =
       top: 20
@@ -58,6 +57,3 @@ drawGraphic = ->
       .datum data
       .attr "class", "line"
       .attr "d", line
-
-$(document).on 'page:load', drawGraphic
-$(document).ready drawGraphic

data/app/assets/javascripts/adminpanel/jquery.dataTables.min.js

@@ -3,16 +3,16 @@
  * Version:     1.9.4
  * Author:      Allan Jardine (www.sprymedia.co.uk)
  * Info:        www.datatables.net
- * 
+ *
  * Copyright 2008-2012 Allan Jardine, all rights reserved.
  *
  * This source file is free software, under either the GPL v2 license or a
  * BSD style license, available at:
  *   http://datatables.net/license_gpl2
  *   http://datatables.net/license_bsd
- * 
- * This source file is distributed in the hope that it will be useful, but 
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
+ *
+ * This source file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE. See the license files for details.
  */
 (function(X,l,n){var L=function(h){var j=function(e){function o(a,b){var c=j.defaults.columns,d=a.aoColumns.length,c=h.extend({},j.models.oColumn,c,{sSortingClass:a.oClasses.sSortable,sSortingClassJUI:a.oClasses.sSortJUI,nTh:b?b:l.createElement("th"),sTitle:c.sTitle?c.sTitle:b?b.innerHTML:"",aDataSort:c.aDataSort?c.aDataSort:[d],mData:c.mData?c.oDefaults:d});a.aoColumns.push(c);if(a.aoPreSearchCols[d]===n||null===a.aoPreSearchCols[d])a.aoPreSearchCols[d]=h.extend({},j.models.oSearch);else if(c=a.aoPreSearchCols[d],

data/app/assets/javascripts/adminpanel/realm.js

@@ -1,4 +1,4 @@
-var ready = function(){
+$(document).on('turbolinks:load', function(){
 
   // toggle arrow on menu items
   // $('.accordion-heading .accordion-toggle').click(function(){
@@ -56,11 +56,7 @@ var ready = function(){
 
   $('.datepicker-basic').datepicker();
 
-};
-
-$(document).ready(ready);
-$(document).on('page:load', ready);
-
+});
 
 //-----  Side menu functions -----
 

data/app/assets/javascripts/adminpanel/sortable.js.coffee

@@ -1,4 +1,4 @@
-ready = ->
+$(document).on 'turbolinks:load', ->
   $('tbody#sortable').sortable
     update: (event, ui) ->
       position = 1
@@ -21,7 +21,3 @@ ready = ->
         else
           position++
   $('tbody#sortable').disableSelection
-
-
-$(document).ready(ready)
-$(document).on('page:load', ready)

data/app/assets/javascripts/adminpanel/spinner.js.coffee

@@ -1,11 +1,11 @@
 $(document).on 'click', 'a.spinner-link', ->
-  $( @ ).attr 'data-clicked', true
+  $(@).attr 'data-clicked', true
 
-$(document).on 'page:fetch', ->
+$(document).on 'turbolinks:click', ->
   $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass('hidden')
   $('a.spinner-link[data-clicked="true"]').prepend '<i class="fa fa-spinner fa-spin"></i>'
 
-$(document).on 'page:restore', ->
+$(document).on 'turbolinks:render', ->
   $('a.spinner-link[data-clicked="true"]').children('i:first').remove()
   $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass('hidden')
   $('a.spinner-link[data-clicked="true"]').attr 'data-clicked', false