quick_script 0.0.51 → 0.0.52

data/lib/quick_script/assets/css/quick_script.css

@@ -1,4 +1,4 @@
-/* QS_VERSION=0.0.50;
+/* QS_VERSION=0.0.52;
  *= require ./basics
  *= require ./buttons
  */

data/lib/quick_script/assets/js/framework.js.coffee

@@ -252,7 +252,9 @@ jQuery.ajax_qs = (opts)->
 			else
 				opts.error() if opts.error?
 	req.upload.addEventListener('error', opts.error) if opts.error?
-	req.upload.addEventListener('progress', opts.progress) if opts.progress?
+	if opts.progress?
+		req.upload.addEventListener 'progress', (ev)->
+			opts.progress(ev, Math.floor( ev.loaded / ev.total * 100 ))
 	req.open opts.type, opts.url, true
 	req.setRequestHeader 'X-CSRF-Token', jQuery('meta[name="csrf-token"]').attr('content')
 	req.send(data)
@@ -318,12 +320,12 @@ class @Model
 		if (@model_state() != ko.modelStates.READY)
 			console.log("Save postponed.")
 			return
-		opts = @toJS(fields)
+		opts = @toAPI(fields)
 		opts['id'] = @id()
 		@adapter.save
 			data: opts
-			progress : (ev)=>
-				@saveProgress( Math.floor( ev.loaded / ev.total * 100 ) )
+			progress : (ev, prog)=>
+				@saveProgress( prog )
 			success : (resp)=>
 				@handleData(resp.data)
 				callback(resp) if callback?
@@ -363,6 +365,17 @@ class @Model
 			else
 				obj[prop] = @[prop]()
 		obj
+	toAPI : (flds)=>
+		flds ||= @fields
+		obj = {}
+		for prop in flds
+			if typeof(@[prop].toAPI) == 'function'
+				obj[prop] = @[prop].toAPI()
+			else if typeof(@[prop].toJS) == 'function'
+				obj[prop] = @[prop].toJS()
+			else
+				obj[prop] = @[prop]()
+		obj
 	toJSON : (flds)=>
 		JSON.stringify(@toJS(flds))
 	absorb : (model) =>
@@ -389,10 +402,11 @@ class @FileModel extends @Model
 			, this
 		@input.isImage = ->
 			if @input.present() then @input.file().type.match('image.*') else false
+		@input.clear = -> @input.files([])
 	reset : ->
 		super
 		@input.files([])
-	toJS : =>
+	toAPI : =>
 		@input.file()
 
 class @Collection
@@ -544,6 +558,11 @@ class @Collection
 		for item in @items()
 			objs.push(item.toJS())
 		objs
+	toAPI : =>
+		objs = []
+		for item in @items()
+			objs.push(item.toAPI())
+		objs
 
 Collection.REPLACE = 0
 Collection.INSERT = 1
@@ -635,7 +654,7 @@ class @ModelAdapter
 			success : opts.success
 			error : opts.error
 	send : (opts)->
-		$.ajax
+		$.ajax_qs
 			type : 'POST'
 			url : opts.url
 			data : opts.data
@@ -674,9 +693,15 @@ class @AccountAdapter
 	sendInviteCode : (code, callback)->
 		$.post @enter_code_url, {code : code}, (resp) =>
 			callback(resp)
-	save : (opts, callback) ->
-		$.post @save_url, opts, (resp) =>
-			callback(resp)
+	save : (opts) ->
+		opts ||= {}
+		$.ajax_qs
+			type : 'POST'
+			url : @save_url
+			data : opts.data
+			progress : opts.progress
+			success : opts.success
+			error : opts.error
 	resetPassword : (callback)->
 		@is_loading(true)
 		opts = {}
@@ -684,6 +709,16 @@ class @AccountAdapter
 		$.post @reset_url, opts, (resp) =>
 				@is_loading(false)
 				callback(resp) if callback?
+	send : (opts)->
+		$.ajax_qs
+			type : 'POST'
+			url : opts.url
+			data : opts.data
+			progress : opts.progress
+			success : opts.success
+			error : opts.error
+	add_method : (fn_name, fn)->
+		@[fn_name] = fn.bind(this)
 
 class @AppView extends @View
 	constructor : (user_model)->

data/lib/quick_script/assets/js/quick_script.js

@@ -1,4 +1,4 @@
-// QS_VERSION = 0.0.51;
+// QS_VERSION = 0.0.52;
 //= require ./jquery.min
 //= require ./jquery-ui.min
 //= require ./jquery.iframe-transport

data/lib/quick_script/version.rb

@@ -1,3 +1,3 @@
 module QuickScript
-  VERSION = "0.0.51"
+  VERSION = "0.0.52"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quick_script
 version: !ruby/object:Gem::Version 
-  hash: 121
+  hash: 119
   prerelease: 
   segments: 
   - 0
   - 0
-  - 51
-  version: 0.0.51
+  - 52
+  version: 0.0.52
 platform: ruby
 authors: 
 - Alan Graham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-25 00:00:00 Z
+date: 2012-03-30 00:00:00 Z
 dependencies: []
 
 description: Framework for single-page web applications