Skip to content

Commit

Permalink
I said convert to spaces dammit!
Browse files Browse the repository at this point in the history
  • Loading branch information
elektronaut committed Jun 13, 2012
1 parent bc88e3f commit 2409b88
Show file tree
Hide file tree
Showing 305 changed files with 334 additions and 329 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ solr/*
public/cache
public/system
public/doodles
public/themes/*.zip
public/themes/*.zip
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--colour --drb
--colour --drb
2 changes: 1 addition & 1 deletion Capfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
load 'config/deploy'
load 'config/deploy'
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,4 @@ group :test, :development do
gem 'guard-spork'
gem 'guard-rspec'
gem 'guard-cucumber'
end
end
2 changes: 1 addition & 1 deletion Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ guard 'cucumber', :cli => '' do
watch(%r{^features/.+\.feature$})
watch(%r{^features/support/.+$}) { 'features' }
watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
end
end
2 changes: 1 addition & 1 deletion MIT-LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion README.rdoc
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
THE SOFTWARE.
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

require File.expand_path('../config/application', __FILE__)

Sugar::Application.load_tasks
Sugar::Application.load_tasks
2 changes: 1 addition & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@

jQuery(document).ready(function () {
Sugar.init();
});
});
1 change: 1 addition & 0 deletions app/assets/javascripts/backbone/models/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions app/assets/javascripts/backbone/routers/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

2 changes: 1 addition & 1 deletion app/assets/javascripts/backbone/sugar.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ window.Sugar =
Models: {}
Collections: {}
Routers: {}
Views: {}
Views: {}
1 change: 1 addition & 0 deletions app/assets/javascripts/backbone/templates/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions app/assets/javascripts/backbone/views/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ class Sugar.Views.Application extends Backbone.View
this.view = new Sugar.Views.Posts({el: this})

$(Sugar).trigger('ready')

4 changes: 2 additions & 2 deletions app/assets/javascripts/backbone/views/posts.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ class Sugar.Views.Posts extends Backbone.View

# Render additional posts when loaded
$(Sugar).bind 'postsloaded', (event, posts) ->
posts.each ->
view.postViews.push new Sugar.Views.Post({el: this}).render()
posts.each ->
view.postViews.push new Sugar.Views.Post({el: this}).render()
2 changes: 1 addition & 1 deletion app/assets/javascripts/mobile.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ $(document).ready ->
container.spoilerApplied = true

resizeYoutube()
Sugar.init()
Sugar.init()
1 change: 0 additions & 1 deletion app/assets/javascripts/sugar.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,3 @@ $.extend window.Sugar,
if options.add
$(this).val $(this).val() + options.add
$(this).focus()

Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ $(Sugar).bind 'ready', ->

clearInterval title.keypressInterval
, 500)
), 10
), 10
2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/facebook.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ Sugar.Facebook =
e = document.createElement("script")
e.src = document.location.protocol + "//connect.facebook.net/en_US/all.js"
e.async = true
document.getElementById("fb-root").appendChild e
document.getElementById("fb-root").appendChild e
12 changes: 6 additions & 6 deletions app/assets/javascripts/sugar/hotkeys.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Sugar.Hotkeys =
110: "."
111: "/"

# Apply functionality
# Apply functionality
apply: ->
if $("table.discussions").length > 0
@setup.discussionsNavigation()
Expand Down Expand Up @@ -122,7 +122,7 @@ Sugar.Hotkeys =

setup:

# Global hotkeys
# Global hotkeys
global: ->
gotoPrevPage = (event) ->
document.location = $(".prev_page_link").get(0).href if not event.metaKey and $(".prev_page_link").length > 0
Expand Down Expand Up @@ -165,7 +165,7 @@ Sugar.Hotkeys =

# Navigating posts
postsNavigation: ->
# Find targets
# Find targets
$(".posts .post").each ->
Sugar.Hotkeys.addTarget this, @id.match(/(post|message)\-([\d]+)/)[2]

Expand Down Expand Up @@ -201,7 +201,7 @@ Sugar.Hotkeys =

# Post functions
postsFunctions: ->
# Load new posts
# Load new posts
$(document).bind "keydown", "r", (event) ->
Sugar.loadNewPosts() unless event.metaKey

Expand Down Expand Up @@ -245,7 +245,7 @@ Sugar.Hotkeys =

# Discussion functions
discussionsFunctions: ->
# Open target
# Open target
openTarget = (openInNewTab) ->
if Sugar.Hotkeys.currentTarget
targetUrl = Sugar.Hotkeys.currentTarget.href
Expand Down Expand Up @@ -281,4 +281,4 @@ Sugar.Hotkeys =

# Create a new discussoin
$(document).bind "keydown", "c", (event) ->
document.location = $(".functions .create").get(0).href if not event.metaKey and $(".functions .create").length > 0
document.location = $(".functions .create").get(0).href if not event.metaKey and $(".functions .create").length > 0
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ $ ->
link.href += 'tag=' + referral_id

$(Sugar).bind('postsloaded', apply_referral_links)
apply_referral_links()
apply_referral_links()
34 changes: 17 additions & 17 deletions app/assets/javascripts/sugar/posts/buttons.js.coffee
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
$(Sugar).bind 'ready', ->

$buttons = $('#button-container')
$buttons = $('#button-container')

show_status = (message) ->
$buttons.find('.status').html(message)
$buttons.find('button').hide()
$buttons.addClass('posting')
show_status = (message) ->
$buttons.find('.status').html(message)
$buttons.find('button').hide()
$buttons.addClass('posting')

clear_status = ->
$buttons.find('.status').html('')
$buttons.find('button').fadeIn('fast')
$buttons.removeClass('posting')
if $(".posts #previewPost").length > 0
$buttons.find('.preview span').html('Update Preview')
else
$buttons.find('.preview span').html('Preview')
clear_status = ->
$buttons.find('.status').html('')
$buttons.find('button').fadeIn('fast')
$buttons.removeClass('posting')
if $(".posts #previewPost").length > 0
$buttons.find('.preview span').html('Update Preview')
else
$buttons.find('.preview span').html('Preview')

$(Sugar).bind 'posting-status', (event, message) ->
show_status message
$(Sugar).bind 'posting-status', (event, message) ->
show_status message

$(Sugar).bind 'posting-complete', ->
clear_status()
$(Sugar).bind 'posting-complete', ->
clear_status()
2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/posts/mp3player.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ Sugar.MP3Player =
if @playingSong and @playingSong is song
@stopSong song
else
@playSong song
@playSong song
18 changes: 9 additions & 9 deletions app/assets/javascripts/sugar/posts/spoiler.js.coffee
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
$(Sugar).bind 'ready postsloaded', ->

$('.spoiler').each ->
if $(this).find('.innerSpoiler').length == 0
$(this)
.wrapInner('<span class="innerSpoiler"></span>')
.prepend('<span class="spoilerLabel">Spoiler!</span> ')
if $(this).find('.innerSpoiler').length == 0
$(this)
.wrapInner('<span class="innerSpoiler"></span>')
.prepend('<span class="spoilerLabel">Spoiler!</span> ')

$(this).find('.innerSpoiler').css('visibility', 'hidden')
$(this).hover ->
$(this).find('.innerSpoiler').css('visibility', 'visible')
, ->
$(this).find('.innerSpoiler').css('visibility', 'hidden')
$(this).find('.innerSpoiler').css('visibility', 'hidden')
$(this).hover ->
$(this).find('.innerSpoiler').css('visibility', 'visible')
, ->
$(this).find('.innerSpoiler').css('visibility', 'hidden')
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ $(Sugar).bind 'ready postsloaded', ->
parent.className = parent.className + ' brush: ' + language
$(parent).closest('.body').addClass('syntax')

SyntaxHighlighter.all();
SyntaxHighlighter.all();
2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/search.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ $(Sugar).bind 'ready', ->
query = encodeURIComponent($(form).find(".query").val())
searchURL = action + "?q=" + query
document.location = searchURL
false
false
3 changes: 1 addition & 2 deletions app/assets/javascripts/sugar/style.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

$(Sugar).bind 'ready modified', ->

# Wrap button content in a span
# Wrap button content in a span
$('a.button, button').each ->
if $(this).find('span').length == 0
$(this).wrapInner('<span />')
Expand Down Expand Up @@ -37,4 +37,3 @@ $(Sugar).bind 'ready', ->
# Tabs on admin configuration
$('.admin.configuration .tabs').each ->
new Sugar.Tabs this, showFirstTab: true

2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/tabs.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ Sugar.Tabs = (controls, options) ->
controls.showTab controls.tabs[0] if not tabShown and settings.showFirstTab
@controls = controls
@tabs = @controls.tabs
this
this
2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/timestamps.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ $(Sugar).bind 'ready postsloaded', ->
if delta < (14 * 24 * 24 * 60)
$(this).timeago()
else
$(this).html(formatDate(date))
$(this).html(formatDate(date))
4 changes: 2 additions & 2 deletions app/assets/javascripts/sugar/users/edit_profile.js.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$(Sugar).bind 'ready', ->

# Checkbox logic
# Checkbox logic
$('.edit_user_profile').each ->

checkTrusted = ->
Expand Down Expand Up @@ -109,4 +109,4 @@ $(Sugar).bind 'ready', ->
createUserMarker position
map.setCenter position
map.setZoom 6 if map.getZoom() <= 4
hasLocation = true
hasLocation = true
2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/users/map.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $(Sugar).bind 'ready', ->
"<a href=\"/users/profile/" + user.username + "\">View profile</a>"

infowindow = new google.maps.InfoWindow
content: contentString
content: contentString

google.maps.event.addListener marker, 'click', ->
infowindow.open(map, marker);
2 changes: 1 addition & 1 deletion app/assets/javascripts/sugar/users/profile.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ $(Sugar).bind 'ready', ->
user_id: fuid
per_page: 15
callback: (list) ->
$("#flickrPhotos").show()
$("#flickrPhotos").show()
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@

// CommonJS
typeof(exports) != 'undefined' ? exports.Brush = Brush : null;
})();
})();
Loading

0 comments on commit 2409b88

Please sign in to comment.