Permalink
Browse files

Ajout de contenu

  • Loading branch information...
sieben committed Apr 17, 2012
1 parent 737423b commit f14101c432fe48e20236724ece0917fefc2624c2
Showing with 1 addition and 191 deletions.
  1. +1 −11 _includes/js.html
  2. +0 −180 static/js/application.js
View
@@ -1,18 +1,15 @@
-<!-- JavaScript at the bottom for fast page loading -->
-<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
+<script src="http://platform.twitter.com/widgets.js"></script>
<script src="static/js/jquery.js"></script>
<script src="static/js/bootstrap-transition.js"></script>
<script src="static/js/bootstrap-alert.js"></script>
<script src="static/js/bootstrap-modal.js"></script>
<script src="static/js/bootstrap-dropdown.js"></script>
-<script src="static/js/bootstrap-scrollspy.js"></script>
<script src="static/js/bootstrap-tab.js"></script>
<script src="static/js/bootstrap-tooltip.js"></script>
<script src="static/js/bootstrap-popover.js"></script>
<script src="static/js/bootstrap-button.js"></script>
<script src="static/js/bootstrap-collapse.js"></script>
<script src="static/js/bootstrap-typeahead.js"></script>
-<script src="static/js/application.js"></script>
<script src="http://code.leafletjs.com/leaflet-0.3.1/leaflet.js"></script>
@@ -22,20 +19,13 @@
cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18, attribution: cloudmadeAttribution});
map.setView(new L.LatLng(48.8418, 2.3448), 15).addLayer(cloudmade);
-
var markerLocation = new L.LatLng(48.8418, 2.3448),
marker = new L.Marker(markerLocation);
-
map.addLayer(marker);
-
marker.bindPopup("<b>ENS Ulm</b><br />Ça va envoyer du GRAU").openPopup();
-
map.on('click', onMapClick);
-
var popup = new L.Popup();
-</script>
-<script>
$(function () {
$('.tabs a:last').tab('show')
})
View
@@ -1,180 +0,0 @@
-// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
-// IT'S ALL JUST JUNK FOR OUR DOCS!
-// ++++++++++++++++++++++++++++++++++++++++++
-
-!function ($) {
-
- $(function(){
-
- // Disable certain links in docs
- $('section [href^=#]').click(function (e) {
- e.preventDefault()
- })
-
- // make code pretty
- window.prettyPrint && prettyPrint()
-
- // add-ons
- $('.add-on :checkbox').on('click', function () {
- var $this = $(this)
- , method = $this.attr('checked') ? 'addClass' : 'removeClass'
- $(this).parents('.add-on')[method]('active')
- })
-
- // position static twipsies for components page
- if ($(".twipsies a").length) {
- $(window).on('load resize', function () {
- $(".twipsies a").each(function () {
- $(this)
- .tooltip({
- placement: $(this).attr('title')
- , trigger: 'manual'
- })
- .tooltip('show')
- })
- })
- }
-
- // add tipsies to grid for scaffolding
- if ($('#grid-system').length) {
- $('#grid-system').tooltip({
- selector: '.show-grid > div'
- , title: function () { return $(this).width() + 'px' }
- })
- }
-
- // fix sub nav on scroll
- var $win = $(window)
- , $nav = $('.subnav')
- , navTop = $('.subnav').length && $('.subnav').offset().top - 40
- , isFixed = 0
-
- processScroll()
-
- $win.on('scroll', processScroll)
-
- function processScroll() {
- var i, scrollTop = $win.scrollTop()
- if (scrollTop >= navTop && !isFixed) {
- isFixed = 1
- $nav.addClass('subnav-fixed')
- } else if (scrollTop <= navTop && isFixed) {
- isFixed = 0
- $nav.removeClass('subnav-fixed')
- }
- }
-
- // tooltip demo
- $('.tooltip-demo.well').tooltip({
- selector: "a[rel=tooltip]"
- })
-
- $('.tooltip-test').tooltip()
- $('.popover-test').popover()
-
- // popover demo
- $("a[rel=popover]")
- .popover()
- .click(function(e) {
- e.preventDefault()
- })
-
- // button state demo
- $('#fat-btn')
- .click(function () {
- var btn = $(this)
- btn.button('loading')
- setTimeout(function () {
- btn.button('reset')
- }, 3000)
- })
-
- // carousel demo
- $('#myCarousel').carousel()
-
- // javascript build logic
- var inputsComponent = $("#components.download input")
- , inputsPlugin = $("#plugins.download input")
- , inputsVariables = $("#variables.download input")
-
- // toggle all plugin checkboxes
- $('#components.download .toggle-all').on('click', function (e) {
- e.preventDefault()
- inputsComponent.attr('checked', !inputsComponent.is(':checked'))
- })
-
- $('#plugins.download .toggle-all').on('click', function (e) {
- e.preventDefault()
- inputsPlugin.attr('checked', !inputsPlugin.is(':checked'))
- })
-
- $('#variables.download .toggle-all').on('click', function (e) {
- e.preventDefault()
- inputsVariables.val('')
- })
-
- // request built javascript
- $('.download-btn').on('click', function () {
-
- var css = $("#components.download input:checked")
- .map(function () { return this.value })
- .toArray()
- , js = $("#plugins.download input:checked")
- .map(function () { return this.value })
- .toArray()
- , vars = {}
- , img = ['glyphicons-halflings.png', 'glyphicons-halflings-white.png']
-
- $("#variables.download input")
- .each(function () {
- $(this).val() && (vars[ $(this).prev().text() ] = $(this).val())
- })
-
- $.ajax({
- type: 'POST'
- , url: 'http://bootstrap.herokuapp.com'
- , dataType: 'jsonpi'
- , params: {
- js: js
- , css: css
- , vars: vars
- , img: img
- }
- })
- })
-
- })
-
-// Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi
-$.ajaxTransport('jsonpi', function(opts, originalOptions, jqXHR) {
- var url = opts.url;
-
- return {
- send: function(_, completeCallback) {
- var name = 'jQuery_iframe_' + jQuery.now()
- , iframe, form
-
- iframe = $('<iframe>')
- .attr('name', name)
- .appendTo('head')
-
- form = $('<form>')
- .attr('method', opts.type) // GET or POST
- .attr('action', url)
- .attr('target', name)
-
- $.each(opts.params, function(k, v) {
-
- $('<input>')
- .attr('type', 'hidden')
- .attr('name', k)
- .attr('value', typeof v == 'string' ? v : JSON.stringify(v))
- .appendTo(form)
- })
-
- form.appendTo('body').submit()
- }
- }
-})
-
-}(window.jQuery)

0 comments on commit f14101c

Please sign in to comment.