tenon 1.0.30 → 1.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca3f38752e365cacea4884b7f6b110219d0e419
-  data.tar.gz: 1dcf4c6875aaad31017bc915ea2424efb37d0723
+  metadata.gz: 5284723eeed1bf522c2a56e3cf2986c4e56ed3e0
+  data.tar.gz: 39452e80c5f9e020c20f598121ca3460bc8269c1
 SHA512:
-  metadata.gz: 24e930b9842ade7b39be4920eeaee4ea4b9fb7c5c5b71c8fa3af9a640a7b2e96ad7460f8aaad1962e27ec86acb7b250cb4bfa6f52d8bb93368b743f5c67b1224
-  data.tar.gz: dee64e261c020471aa37c0acafe692fde4846869daecac6e0e5230891a55df20f0741dcd7fd724e3b499fb872e84f030a0848d89b10da37661b01a5fa21db375
+  metadata.gz: d8758fa8e8724e6f3fbdc7f5f1dcd89fafd812c328c12540216387d13e82dab52d04a94f1f4fdff3216e198fbb6ec340d066846adc6fd5f03fb34f9510c883b8
+  data.tar.gz: 6231d7d545676ca6d5ba4302ec397d7f4706e7ad9e10c8b61e679e9146faeca09ee228782c14ca1d8dbc11c19065d7362973fec47bb429cb6fd23927b8d7f3ee

data/app/assets/javascripts/tenon/features/focus_first_field.js.coffee

@@ -0,0 +1,8 @@
+class Tenon.features.FocusFirstField
+  constructor: ->
+    $firstField = $($(".main-content form input[type!='hidden'], .main-content form select, .main-content form textarea")[0])
+    $firstField.focus()
+
+    if $firstField.is('input[type=text], textarea')
+      length = $firstField.val().length
+      $firstField[0].setSelectionRange(length, length)

data/app/assets/javascripts/tenon/features/protect_changes.js.coffee

@@ -0,0 +1,25 @@
+class Tenon.features.ProtectChanges
+  constructor: ->
+    @changesMade = false
+    @bindChangeEvents()
+    $(window).on('beforeunload', @confirmNavigation)
+
+  bindChangeEvents: =>
+    @$form = $('.main-content form')
+    @$form.on('cocoon:after-insert cocoon:after-remove', @_markChanged)
+    @$form.on('keyup change', 'input, select, textarea', @_markChanged)
+    @$form.on('input', '.editable-text', @_markChanged)
+    @$form.on('submit', @_clearChanges)
+
+  _markChanged: (e) =>
+    ignore = [37, 38, 39, 40, 20, 16, 17, 18]
+    code = e.keyCode || e.which
+    @changesMade = true if $.inArray(code, ignore) == -1
+
+  _clearChanges: =>
+    @changesMade = false
+    return true
+
+  confirmNavigation: =>
+    if @changesMade
+      'You have unsaved changes, are you sure you want to leave this page?'

data/app/assets/javascripts/tenon/tenon.js

@@ -30,12 +30,12 @@ var Tenon = {
     // init select2
     $('select').select2();
 
-    Tenon.features.forms.init();
     Tenon.features.fileSelectWidget.init();
     new Tenon.features.I18nFields();
     new Tenon.features.Flash();
     new Tenon.features.AssetCropping();
     new Tenon.features.AssetDetachment();
+    new Tenon.features.FocusFirstField();
     new Tenon.features.MainMenu();
     new Tenon.features.Pagination();
     new Tenon.features.HamburgerNavigation();
@@ -46,6 +46,7 @@ var Tenon = {
     new Tenon.features.ItemVersionAutosave();
     new Tenon.features.ModalWindows();
     new Tenon.features.ModalForms();
+    new Tenon.features.ProtectChanges();
     new Tenon.features.RecordApproval();
     new Tenon.features.RecordBooleanToggle();
     new Tenon.features.RecordDeletion();

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.30'
+  VERSION = '1.0.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.30
+  version: 1.0.31
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -930,7 +930,7 @@ files:
 - app/assets/javascripts/tenon/features/date_time_picker.js.coffee
 - app/assets/javascripts/tenon/features/file_select_widget.js.erb
 - app/assets/javascripts/tenon/features/flash.js.coffee
-- app/assets/javascripts/tenon/features/forms.js.erb
+- app/assets/javascripts/tenon/features/focus_first_field.js.coffee
 - app/assets/javascripts/tenon/features/hamburger_navigation.js.coffee
 - app/assets/javascripts/tenon/features/header_menu.js.coffee
 - app/assets/javascripts/tenon/features/i18n_fields.js.coffee
@@ -947,6 +947,7 @@ files:
 - app/assets/javascripts/tenon/features/nested_set_writer.js.coffee
 - app/assets/javascripts/tenon/features/new_item_version_handler.js.coffee
 - app/assets/javascripts/tenon/features/pagination.js.coffee
+- app/assets/javascripts/tenon/features/protect_changes.js.coffee
 - app/assets/javascripts/tenon/features/quick_search.js.coffee
 - app/assets/javascripts/tenon/features/record_approval.js.coffee
 - app/assets/javascripts/tenon/features/record_boolean_toggle.js.coffee

data/app/assets/javascripts/tenon/features/forms.js.erb

@@ -1,47 +0,0 @@
-Tenon.features.forms = {
-  init: function () {
-    var self = Tenon.features.forms;
-    self.setupRadioSliders();
-    self.protectChanges();
-    self.focusFirstField();
-  },
-
-  protectChanges: function () {
-    var self = Tenon.features.forms;
-
-    self.changesMade = false;
-    $('input, select, textarea').bind('keyup change', function() {
-      if ($(this).attr('id') != "quick-search") { self.changesMade = true; }
-    });
-
-    // don't run the check if the user is submitting a form of course
-    $(document).on('submit', 'form', function() {
-      window.onbeforeunload = null;
-    });
-
-    window.onbeforeunload = self.confirmNavigation;
-  },
-
-  confirmNavigation: function () {
-    var self = Tenon.features.forms;
-
-    if (typeof CKEDITOR != 'undefined') {
-      for ( instance in CKEDITOR.instances )
-        if(CKEDITOR.instances[instance].checkDirty()) { self.changesMade = true}
-    }
-
-    if (self.changesMade) {
-      return "You have unsaved changes, are you sure you want to leave this page?";
-    }
-  },
-
-  setupRadioSliders: function () {
-    $('.radio-slider').radioSlider({sliderImage: '<%= asset_path'tenon/slider-button.png' %>'});
-  },
-
-  focusFirstField: function () {
-    el = $(".main-content form input[type!='hidden'], .main-content form select, .main-content form textarea")[0];
-    $(el).focus();
-  }
-
-}