Revert commit 5b4d102 (Fixed error coming up when Next/Prev clicked o…

…n Recorders) (resolved commit manually) Conflicts: app/controllers/models_controller.rb app/views/models/show.html.erb app/views/recorders/show.html.erb
bluecherrydvr · Oct 15, 2014 · 292e420 · 292e420
1 parent 5b4d102
commit 292e420
Show file tree

Hide file tree

Showing 147 changed files with 21,950 additions and 21,955 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,24 +1,24 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
-.DS_Store
-/public/assets/
-/public/system/
-.env
-
-# IDE
-.idea
-/*.env
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+.DS_Store
+/public/assets/
+/public/system/
+.env
+
+# IDE
+.idea
+/*.env
diff --git a/app/assets/javascripts/application.coffee b/app/assets/javascripts/application.coffee
@@ -1,135 +1,135 @@
-#= require jquery
-#= require jquery.turbolinks
-#= require jquery_ujs
-#= require_tree .
-#= require bootstrap
-#= require editable/bootstrap-editable
-#= require editable/rails
-#= require get-style-property
-#= require get-size
-#= require matches-selector
-#= require eventEmitter
-#= require eventie
-#= require doc-ready
-#= require classie
-#= require jquery-bridget
-#= require matches-selector
-#= require outlayer/item
-#= require outlayer
-#= require packery/rect
-#= require packery/packer
-#= require packery/item
-#= require packery
-
-# called from a bootstrap dropdown, this closes the dropdown
-$('a[data-toggle=modal]').on 'click', ->
-  $('.dropdown').removeClass('open')
-
-# this sets up the ajax loader, and it will stay until the method specific js removes it
-$('a[data-target=#signin-modal]').on 'click', ->
-   e.preventDefault()
-   e.stopPropagation()
-   $('body').modalmanager('loading')
-   $.rails.handleRemote( $(this) )
-
-#removes whatever is in the modal body content div upon clicking close/outside modal
-$(document).on 'click', '[data-dismiss=modal], .modal-scrollable', ->
-  $('.modal-body-content').empty()
-$(document).on 'click', '#signin-modal', (e) ->
-  e.stopPropagation()
-
-$ ->
-  $fullsize_image_wrap = $(".fullsize-image")
-  $('.clickable a').each ->
-    target = $(this)
-    target.attr('href', target.attr('data-href'))
-    if target.attr('data-target') == "_blank"
-      target.attr('target', "_blank")
-
-  $container = $('#masonry-container')
-  $container.packery
-    itemSelector: '.tile',
-    gutter: 0
-
-  $('#search_dropdown').on 'click', ->
-    $('.search-dropdown').slideToggle()
-
-  $(".features span").on 'click', ->
-    feature_id = $(this).attr("id").replace('_icon', '')
-    $("#{feature_id}").trigger "click"
-    $(this).toggleClass "selected"
-
-  $(".features input[type=checkbox]").each ->
-    if ( $(this).attr('checked') == 'checked' )
-      image = "##{ $(this).attr('id') }_icon"
-      $(image).addClass("selected")
-
-  $('.module-images').on 'click', ".thumbnails img", (e) ->
-    e.preventDefault()
-    if $(this).hasClass "add-new-image"
-      return
-    clicked_image = $(this).attr('src')
-    $('.module-image-main').attr('src', clicked_image)
-
-  $('.module-information .editable:not(.additional_information)').editable
-    emptytext: 'Unknown'
-    toggle: 'manual'
-    mode: 'inline'
-    ajaxOptions:
-      type: 'PUT'
-
-  $('.module-information .editable.additional_information').editable
-    emptytext: 'Unknown'
-    toggle: 'manual'
-    mode: 'inline'
-    ajaxOptions:
-      type: 'PUT'
-    params: (params) ->
-      $('.module-information .editable.additional_information').each ->
-        target = $(this)
-        attribute = target.attr('data-model')
-        name = target.attr('data-name')
-        value = target.attr('data-value')
-        params["#{attribute}[#{name}]"] = value
-      return params
-
-  $('.module-manufacturer .editable').editable
-    emptytext: 'Unknown'
-    toggle: 'manual'
-    ajaxOptions:
-      type: 'PUT'
-
-  $('.visitor-signed_in .module-table td.icon-edit').on "click", (e) ->
-    e.preventDefault()
-    e.stopPropagation()
-    $(this).closest('tr').find('.editable').editable('toggle')
-
-  $('.visitor-signed_out .add-new-image, .visitor-signed_out .icon-edit').on 'click', (e) ->
-    e.preventDefault()
-    e.stopPropagation()
-    $('#signin-modal').modal()
-
-  $('.visitor-signed_in .add-new-image').on "click", (e) ->
-    e.preventDefault()
-    $(this).closest('.module').find('input[type="file"]').trigger('click')
-
-  $('.module input[type="file"]').change ->
-    $(this).closest('.module').find('form').submit()
-
-  $(".table-cameras a > img").on "mouseenter", ->
-    img = this
-    fullsize_image_url = $(img).attr('data-fullsize')
-    $fullsize_image = $("<img src='#{fullsize_image_url}'>")
-    offset = $(img).offset()
-    $fullsize_image_wrap.css(
-      top: offset.top - 50
-      left: offset.left + 50
-    ).append($fullsize_image).removeClass "hidden"
-
-  $fullsize_image_wrap.add(".table-cameras a > img").on "mouseleave", ->
-    $fullsize_image_wrap.empty().addClass "hidden"
-
-  if $('#manufacturers-show').length
-    slug = window.location.pathname.replace('/','')
-    manufacturer = $('.manufacturer-name').first().text()
-    $("#q_manufacturer_id_eq option:contains('#{manufacturer}')").attr('selected', 'selected')
+#= require jquery
+#= require jquery.turbolinks
+#= require jquery_ujs
+#= require_tree .
+#= require bootstrap
+#= require editable/bootstrap-editable
+#= require editable/rails
+#= require get-style-property
+#= require get-size
+#= require matches-selector
+#= require eventEmitter
+#= require eventie
+#= require doc-ready
+#= require classie
+#= require jquery-bridget
+#= require matches-selector
+#= require outlayer/item
+#= require outlayer
+#= require packery/rect
+#= require packery/packer
+#= require packery/item
+#= require packery
+
+# called from a bootstrap dropdown, this closes the dropdown
+$('a[data-toggle=modal]').on 'click', ->
+  $('.dropdown').removeClass('open')
+
+# this sets up the ajax loader, and it will stay until the method specific js removes it
+$('a[data-target=#signin-modal]').on 'click', ->
+   e.preventDefault()
+   e.stopPropagation()
+   $('body').modalmanager('loading')
+   $.rails.handleRemote( $(this) )
+
+#removes whatever is in the modal body content div upon clicking close/outside modal
+$(document).on 'click', '[data-dismiss=modal], .modal-scrollable', ->
+  $('.modal-body-content').empty()
+$(document).on 'click', '#signin-modal', (e) ->
+  e.stopPropagation()
+
+$ ->
+  $fullsize_image_wrap = $(".fullsize-image")
+  $('.clickable a').each ->
+    target = $(this)
+    target.attr('href', target.attr('data-href'))
+    if target.attr('data-target') == "_blank"
+      target.attr('target', "_blank")
+
+  $container = $('#masonry-container')
+  $container.packery
+    itemSelector: '.tile',
+    gutter: 0
+
+  $('#search_dropdown').on 'click', ->
+    $('.search-dropdown').slideToggle()
+
+  $(".features span").on 'click', ->
+    feature_id = $(this).attr("id").replace('_icon', '')
+    $("#{feature_id}").trigger "click"
+    $(this).toggleClass "selected"
+
+  $(".features input[type=checkbox]").each ->
+    if ( $(this).attr('checked') == 'checked' )
+      image = "##{ $(this).attr('id') }_icon"
+      $(image).addClass("selected")
+
+  $('.module-images').on 'click', ".thumbnails img", (e) ->
+    e.preventDefault()
+    if $(this).hasClass "add-new-image"
+      return
+    clicked_image = $(this).attr('src')
+    $('.module-image-main').attr('src', clicked_image)
+
+  $('.module-information .editable:not(.additional_information)').editable
+    emptytext: 'Unknown'
+    toggle: 'manual'
+    mode: 'inline'
+    ajaxOptions:
+      type: 'PUT'
+
+  $('.module-information .editable.additional_information').editable
+    emptytext: 'Unknown'
+    toggle: 'manual'
+    mode: 'inline'
+    ajaxOptions:
+      type: 'PUT'
+    params: (params) ->
+      $('.module-information .editable.additional_information').each ->
+        target = $(this)
+        attribute = target.attr('data-model')
+        name = target.attr('data-name')
+        value = target.attr('data-value')
+        params["#{attribute}[#{name}]"] = value
+      return params
+
+  $('.module-manufacturer .editable').editable
+    emptytext: 'Unknown'
+    toggle: 'manual'
+    ajaxOptions:
+      type: 'PUT'
+
+  $('.visitor-signed_in .module-table td.icon-edit').on "click", (e) ->
+    e.preventDefault()
+    e.stopPropagation()
+    $(this).closest('tr').find('.editable').editable('toggle')
+
+  $('.visitor-signed_out .add-new-image, .visitor-signed_out .icon-edit').on 'click', (e) ->
+    e.preventDefault()
+    e.stopPropagation()
+    $('#signin-modal').modal()
+
+  $('.visitor-signed_in .add-new-image').on "click", (e) ->
+    e.preventDefault()
+    $(this).closest('.module').find('input[type="file"]').trigger('click')
+
+  $('.module input[type="file"]').change ->
+    $(this).closest('.module').find('form').submit()
+
+  $(".table-cameras a > img").on "mouseenter", ->
+    img = this
+    fullsize_image_url = $(img).attr('data-fullsize')
+    $fullsize_image = $("<img src='#{fullsize_image_url}'>")
+    offset = $(img).offset()
+    $fullsize_image_wrap.css(
+      top: offset.top - 50
+      left: offset.left + 50
+    ).append($fullsize_image).removeClass "hidden"
+
+  $fullsize_image_wrap.add(".table-cameras a > img").on "mouseleave", ->
+    $fullsize_image_wrap.empty().addClass "hidden"
+
+  if $('#manufacturers-show').length
+    slug = window.location.pathname.replace('/','')
+    manufacturer = $('.manufacturer-name').first().text()
+    $("#q_manufacturer_id_eq option:contains('#{manufacturer}')").attr('selected', 'selected')
diff --git a/app/assets/javascripts/cameras.js.coffee b/app/assets/javascripts/cameras.js.coffee
@@ -1,3 +1,3 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/manufacturers.js.coffee b/app/assets/javascripts/manufacturers.js.coffee
@@ -1,3 +1,3 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/javascripts/pages.js.coffee b/app/assets/javascripts/pages.js.coffee
@@ -1,3 +1,3 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://coffeescript.org/
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/