resolve conflict

1 files changed, 12 insertions, 63 deletions

diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index ec4ae3c06..475329398 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -1,96 +1,46 @@
 $(document).ready(function(){
 
-  // Google code prettify
-  // ====================
-
-  prettyPrint();
-
-
-  // scroll spy logic
-  // ================
-
-  var activeTarget,
-      position = {},
-      $window = $(window),
-      nav = $('body > .topbar li a'),
-      targets = nav.map(function () {
-        return $(this).attr('href');
-      }),
-      offsets = $.map(targets, function (id) {
-        return $(id).offset().top;
-      });
-
-  function setButton(id) {
-    nav.parent("li").removeClass('active');
-    $(nav[$.inArray(id, targets)]).parent("li").addClass('active');
-  }
-
-  function processScroll(e) {
-    var scrollTop = $window.scrollTop() + 10, i;
-    for (i = offsets.length; i--;) {
-      if (activeTarget != targets[i] && scrollTop >= offsets[i] && (!offsets[i + 1] || scrollTop <= offsets[i + 1])) {
-        activeTarget = targets[i];
-        setButton(activeTarget);
-      }
-    }
-  }
-
-  nav.click(function () {
-    processScroll();
-  });
-
-  processScroll();
-
-  $window.scroll(processScroll);
-
-
   // Dropdown example for topbar nav
   // ===============================
 
-  $("body").bind("click", function (e) {
-    $('.dropdown-toggle, .menu').parent("li").removeClass("open");
-  });
-  $(".dropdown-toggle, .menu").click(function (e) {
-    var $li = $(this).parent("li").toggleClass('open');
-    return false;
-  });
+  $(".topbar").dropdown() // catch any dropdowns on the page
 
 
   // table sort example
   // ==================
 
-  $("#sortTableExample").tablesorter( {sortList: [[1,0]]} );
+  $("#sortTableExample").tablesorter( { sortList: [[ 1, 0 ]] } )
 
 
   // add on logic
   // ============
 
-  $('.add-on :checkbox').click(function() {
+  $('.add-on :checkbox').click(function () {
     if ($(this).attr('checked')) {
-      $(this).parents('.add-on').addClass('active');
+      $(this).parents('.add-on').addClass('active')
     } else {
-      $(this).parents('.add-on').removeClass('active');
+      $(this).parents('.add-on').removeClass('active')
     }
-  });
+  })
 
 
   // Disable certain links in docs
   // =============================
 
-  $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function(e) {
-    e.preventDefault();
-  });
+  $('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) {
+    e.preventDefault()
+  })
 
   // Copy code blocks in docs
-  $(".copy-code").focus(function() {
+  $(".copy-code").focus(function () {
     var el = this;
     // push select to event loop for chrome :{o
     setTimeout(function () { $(el).select(); }, 1);
   });
 
 
-  // POSITION TWIPSIES
-  // =================
+  // POSITION STATIC TWIPSIES
+  // ========================
 
   $('.twipsies.well a').each(function () {
     var type = this.title
@@ -128,7 +78,6 @@ $(document).ready(function(){
       }
 
     $twipsy.css(offset[type])
-
   });
 
 });