quick_script 0.9.10 → 0.10.0

data/lib/quick_script/version.rb

@@ -1,3 +1,3 @@
 module QuickScript
-  VERSION = "0.9.10"
+  VERSION = "0.10.0"
 end

data/vendor/assets/javascripts/quick_script/classes.js.coffee

@@ -143,22 +143,25 @@ class @Overlay
 Overlay.instance = new Overlay()
 Overlay.closeDialog = ->
 		@remove('dialog')
-Overlay.add = (vm, tmp, options, cls) ->
+Overlay.add = (vm, tmp, opts) ->
+		opts ||= {}
+		css_opts = opts.style || {}
+		cls = opts.class || ''
 		id = vm.name
 		template = tmp
-		cls = cls || ''
-		options = {} if !options?
 		#options['z-index'] = Overlay.instance.zindex + 10
 		$('body').append("<div id='overlay-" + id + "' class='modal hide fade'><button class='close' data-bind='click : hideOverlay'>x</button><div class='content' data-bind=\"template: '" + template + "'\"></div></div>")
-		#$('#overlay-' + id).css(options)
-		#$('#overlay-' + id).addClass(cls)
-		#$('#overlay-' + id).css({'margin-left' : -1 * $('#overlay-' + id).width() / 2})
-		#$('.overlay .content').css({'max-height' : ($(window).height() - 100)})
+		$('#overlay-' + id).css(css_opts)
+		$('#overlay-' + id).addClass(cls)
+		$('#overlay-' + id).css({'margin-left' : -1 * $('#overlay-' + id).width() / 2})
 		#$('#backdrop-' + id).click =>
 			#console.log('backdrop clicked.')
 			#Overlay.remove(id)
 		setTimeout ->
 			$('#overlay-' + id).koBind(vm)
+			if opts.stretch == true
+				$("#overlay-#{id} .modal-body").css({'max-height' : ($(window).height() - 200)})
+				$('#overlay-' + id).css({'margin-top' : ($(window).height() - 100)/ -2})
 			$('#overlay-' + id).modal('show')
 			$('#overlay-' + id).on 'hidden', ->
 				$('#overlay-' + id).koClean()
@@ -182,7 +185,7 @@ Overlay.notify = (msg, cls, tm) ->
 		$('body').prepend("<div id='notify' class='notify' style='display: none;'>" + msg + "</div>")
 		if (cls)
 			$('#notify').addClass(cls)
-		$('#notify').slideDown 'slow', ->
+		$('#notify').fadeIn 'slow', ->
 			Overlay.instance.notifyTimeout = setTimeout ->
 					$('#notify').fadeOut('slow')
 				, tm
@@ -199,13 +202,15 @@ Overlay.confirm = (msg, opts) ->
 			no : ->
 				opts.no() if opts.no?
 				Overlay.remove('confirm')
-		$('body').prepend("<div class='backdrop' id='backdrop-confirm' style='z-index:500'></div><div id='overlay-confirm' class='confirm' style='display: none;'><div class='msg'>" + msg + "</div><div class='opts'><button class='button green' data-bind='click : yes'>yes</button><button class='button red' data-bind='click : no'>no</button></div></div>")
+		$('body').prepend("<div class='backdrop' id='backdrop-confirm' style='z-index:500'></div><div id='overlay-confirm' class='confirm' style='display: none;'><div class='msg'>" + msg + "</div><div class='opts'><button class='btn btn-success' data-bind='click : yes'>yes</button> <button class='btn btn-danger' data-bind='click : no'>no</button></div></div>")
 		$('#overlay-confirm').koBind(vm)
 		$('#overlay-confirm').slideDown 'fast'
 
 Overlay.remove = (id) ->
 		$('#overlay-' + id).modal('hide')
 		$('#popover-' + id).koClean().remove()
+		$('#backdrop-' + id).remove()
+		$('#overlay-' + id).remove() if (id == 'confirm')
 
 Overlay.removePopovers = ->
 		$('.popover').remove()

data/vendor/assets/javascripts/quick_script/framework.js.coffee

@@ -15,6 +15,7 @@
 			shouldDisplay = ko.utils.unwrapObservable(valueAccessor())
 			if shouldDisplay then $(element).slideDown('slow') else $(element).slideUp()
 
+	# buttonStatus - [is_loading, ready_str, loading_str, icon_classes]
 	ko.bindingHandlers.buttonStatus =
 		update : (element, valueAccessor) ->
 			opts = ko.utils.unwrapObservable(valueAccessor())
@@ -29,6 +30,21 @@
 				$(element).html(txt)
 				$(element).removeAttr('disabled')
 
+	# labelStatus - [list, none_str, loading_str]
+	ko.bindingHandlers.listStatus =
+		init : (element, valueAccessor) ->
+			opts = ko.utils.unwrapObservable(valueAccessor())
+			opts[0].is_loading.subscribe ->
+				if opts[0].is_loading()
+					$(element).html(opts[2])
+					$(element).show()
+				else
+					if opts[0].hasItems()
+						$(element).hide()
+					else
+						$(element).show()
+						$(element).html(opts[1])
+
 	ko.bindingHandlers.viewOptions =
 		update : (element, valueAccessor) ->
 			$(element).empty()
@@ -204,21 +220,19 @@
 
 	ko.bindingHandlers.tabs =
 		init : (element, valueAccessor, bindingsAccessor, viewModel) ->
-			$(element).children('ul').first().find('li').each (idx, el)->
+			$(element).children('li').each (idx, el)->
 				tab_id = $(el)[0].id
 				$(el).click ->
 					valueAccessor()(tab_id)
 		update : (element, valueAccessor, bindingsAccessor, viewModel) ->
 			sel_tab = ko.utils.unwrapObservable(valueAccessor())
-			$(element).children('ul').first().children('li').removeClass('selected')
-			$(element).children('ul').first().children("li##{sel_tab}").addClass('selected')
-			$(element).children('div').addClass('hidden')
-			$(element).children("div##{sel_tab}").removeClass('hidden')
+			$(element).children('li').removeClass('active')
+			$(element).children("li##{sel_tab}").addClass('active')
 	ko.bindingHandlers.tab_views =
 		update : (element, valueAccessor, bindingsAccessor, viewModel) ->
 			sel_tab = ko.utils.unwrapObservable(valueAccessor())
-			$(element).children('div').addClass('hidden')
-			$(element).children("div##{sel_tab}").removeClass('hidden')
+			$(element).children('div').addClass('hidden').removeClass('active')
+			$(element).children("div##{sel_tab}").addClass('active').removeClass('hidden')
 
 	ko.bindingHandlers.calendar =
 		init : (element, valueAccessor, bindingsAccessor, viewModel) ->
@@ -671,6 +685,7 @@ class @Collection
 		else if op == Collection.INSERT
 			@model_state(ko.modelStates.INSERTING)
 	load : (scope, callback)->
+		@reset()
 		@scope(scope) if scope?
 		@_load(@scope(), Collection.REPLACE, callback)
 	update : (callback)->
@@ -914,12 +929,7 @@ class @ModelAdapter
 		opts.url = @save_url
 		@send opts
 	send : (opts)->
-		def_err_fn = ->
-			opts.success({meta : 500, data : ['An error occurred.']})
-		opts.type = 'POST' if !opts.type?
-		opts.url = @host + opts.url
-		opts.error = def_err_fn unless opts.error?
-		$.ajax_qs opts
+		ModelAdapter.send(@host, opts)
 	delete : (opts)->
 		$.ajax
 			type : 'DELETE'
@@ -929,18 +939,14 @@ class @ModelAdapter
 			error : opts.error
 	add_method : (fn_name, fn)->
 		@[fn_name] = fn.bind(this)
-
-class @LocalStore
-LocalStore.save = (key, val, exp_days, callback)->
-	Lawnchair ->
-		@save {key : key, val : val}, callback
-LocalStore.get = (key, callback)->
-	Lawnchair ->
-		@get key, (data)->
-			if data?
-				callback(data.val)
-			else
-				callback(null)
+ModelAdapter.send = (host, opts)->
+	def_err_fn = ->
+		opts.success({meta : 500, data : ['An error occurred.']})
+	opts.type = 'POST' if !opts.type?
+	opts.url = host + opts.url
+	opts.error = def_err_fn unless opts.error?
+	opts.success = opts.callback if opts.callback?
+	$.ajax_qs opts
 
 class @AccountAdapter
 	constructor : (opts)->
@@ -956,35 +962,27 @@ class @AccountAdapter
 		@host = ""
 		for prop,val of opts
 			@[prop] = val
-	login : (username, password, callback)->
-		opts = {}
-		opts[@login_key] = username
-		opts[@password_key] = password
-		@send
-			url : @login_url
-			data : opts
-			success : (resp) =>
-				callback(resp)
-	logout : (callback)->
-		@send
-			url : @logout_url
-			success : (resp) =>
-				callback(resp)
-	register : (opts, callback)->
-		$.post (@host + @register_url), opts, (resp) =>
-			callback(resp)
+	login : (username, password, opts)->
+		opts.data = {} unless opts.data?
+		opts.url = @host + @login_url
+		opts.data[@login_key] = username
+		opts.data[@password_key] = password
+		@send opts
+	logout : (opts)->
+		opts.data = {}
+		opts.url = @host + @logout_url
+		@send opts
+	register : (data_opts, opts)->
+		opts.data = data_opts
+		opts.url = @host + @register_url
+		@send opts
 	sendInviteCode : (code, callback)->
 		$.post (@host + @enter_code_url), {code : code}, (resp) =>
 			callback(resp)
-	save : (opts) ->
-		opts ||= {}
-		$.ajax_qs
-			type : 'POST'
-			url : @host + @save_url
-			data : opts.data
-			progress : opts.progress
-			success : opts.success
-			error : opts.error
+	save : (data_opts, opts) ->
+		opts.data = data_opts
+		opts.url = @host + @save_url
+		@send opts
 	load : (opts) ->
 		opts ||= {}
 		$.ajax_qs
@@ -1000,15 +998,7 @@ class @AccountAdapter
 		$.post (@host + @reset_url), opts, (resp) =>
 				callback(resp) if callback?
 	send : (opts)->
-		def_err_fn = ->
-			opts.success({meta : 500, data : ['An error occurred.']})
-		$.ajax_qs
-			type : 'POST'
-			url : @host + opts.url
-			data : opts.data
-			progress : opts.progress
-			success : opts.success
-			error : opts.error || def_err_fn
+		ModelAdapter.send(@host, opts)
 	delete : (opts)->
 		$.ajax_qs
 			type : 'DELETE'
@@ -1020,6 +1010,19 @@ class @AccountAdapter
 	add_method : (fn_name, fn)->
 		@[fn_name] = fn.bind(this)
 
+class @LocalStore
+LocalStore.save = (key, val, exp_days, callback)->
+	Lawnchair ->
+		@save {key : key, val : val}, callback
+LocalStore.get = (key, callback)->
+	Lawnchair ->
+		@get key, (data)->
+			if data?
+				callback(data.val)
+			else
+				callback(null)
+
+
 class @AppView extends @View
 	constructor : (user_model)->
 		@app = this

data/vendor/assets/stylesheets/quick_script/basics.css.sass

@@ -1,5 +1,11 @@
 @import mixins
 
+[class^="icon-"], [class*=" icon-"]
+  background-image: image-url("glyphicons-halflings.png")
+
+.icon-white
+  background-image: image-url("glyphicons-halflings-white.png")
+
 .p-rel
   +p-rel
 .p-abs

data/vendor/assets/stylesheets/quick_script/elements.css.sass

@@ -77,16 +77,18 @@
   +t-4
   +t-center
   +t-shadow-dark
+  +border-radius(10px)
   width: 500px
-  top: 0px
+  top: 10px
   left: 50%
   margin-left: -265px
   z-index: 10000
   background: $green
+  line-height: 30px
   color: white
-  border-left: 2px solid $white
-  border-right: 2px solid $white
-  border-bottom: 2px solid $white
+  //border-left: 2px solid $white
+  //border-right: 2px solid $white
+  //border-bottom: 2px solid $white
   font-weight: bold
   opacity: 0.9
 
@@ -108,6 +110,8 @@
   opacity: 0.9
   .msg
     float: left
+    font-size: 20px
+    line-height: 30px
   .opts
     float: right
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 9
   - 10
-  version: 0.9.10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Alan Graham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-10 00:00:00 -04:00
+date: 2012-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: []