bugfix: colors were not assigning values in selector
BUG: color to array is returning wrong data
This commit is contained in:
Howland Owl
parent
74d7728881
commit
da4cf077cc
3 changed files with 59 additions and 22 deletions
|
|
@ -133,7 +133,8 @@ does not alter the array. Alternately, _have_ it alter the array.
|
|||
|
||||
buildlist: (data) ->
|
||||
$('#list').show 100
|
||||
$('#sortlist').append @.additem item for item in @data.filedata
|
||||
x = 0
|
||||
$('#sortlist').append @.additem item,x++ for item in @data.filedata
|
||||
$('#sortlist').sortable
|
||||
start: (event,ui) ->
|
||||
ui.item.data {startpos:ui.item.index()}
|
||||
|
|
@ -154,12 +155,12 @@ insert it into the array at end position. A la the draggon-dropping.
|
|||
tarr[0...endpos].concat [moving].concat tarr[endpos..-1]
|
||||
|
||||
|
||||
additem: (item) ->
|
||||
additem: (item,pos) ->
|
||||
entry = $("<li class='entry' id='#{item.file}'><span class='ui-icon ui-icon-arrowthick-2-n-s'></span>#{ansiorascii booltoint item.amiga} | #{item.author} : #{item.name} : #{item.file}</li>")
|
||||
entry.dblclick =>
|
||||
@.editline item
|
||||
@.editline item,pos
|
||||
|
||||
editline: (data) ->
|
||||
editline: (data,pos) ->
|
||||
$("#formica").dialog {
|
||||
width:'800',
|
||||
modal: false,
|
||||
|
|
@ -181,28 +182,36 @@ insert it into the array at end position. A la the draggon-dropping.
|
|||
|
||||
$("#smt").click (event) =>
|
||||
event.preventDefault()
|
||||
pos = $("#entryindex").val()
|
||||
entry = @data.filedata[pos]
|
||||
entry.name = $("#entryname").val()
|
||||
entry.author = $("#entryauthor").val()
|
||||
entry.amiga = inttobool $("#entryamiga").val()
|
||||
entry.color = colortoarray $("#entrycolor").val()
|
||||
entry.bg = colortoarray $("#entrybg").val()
|
||||
entry.width = $("#entrywidth").val()
|
||||
entry.line1 = $("#entryline1").val()
|
||||
entry.line2 = $("#entryline2").val()
|
||||
entry.text = $("#entrytext").val()
|
||||
entry.file = $("#entryfile").val()
|
||||
console.log entry
|
||||
|
||||
alert @
|
||||
|
||||
data.amiga = booltoint data.amiga
|
||||
|
||||
$("#entryindex").val data.index
|
||||
$("#entryindex").val pos
|
||||
$("#entryname").val data.name
|
||||
$("#entryauthor").val data.author
|
||||
$("#entryamiga").val data.amiga
|
||||
$("#entryamiga").children()[1].textContent = ansiorascii data.amiga
|
||||
$("#entryfont").val data.font
|
||||
|
||||
fix these color entries to supply rgb() bits
|
||||
|
||||
$("#entrycolor").val data.color
|
||||
$("#entrybg").val data.bg
|
||||
$("#entrycolor").val colortoname arraytocolor data.color
|
||||
$("#entrybg").val colortoname arraytocolor data.bg
|
||||
$("#entrywidth").val data.width
|
||||
$("#entryline1").val data.line1
|
||||
$("#entryline2").val data.line2
|
||||
$("#entrytext").val data.text
|
||||
$("#entryfile").val data.file
|
||||
Need to change the file name, but we don't seem to have the ability to do so.
|
||||
|
||||
|
||||
A Helper function to dump json out of an object as text:
|
||||
|
|
@ -247,6 +256,30 @@ we actually _want_ that limitation in the output.
|
|||
x.push 0
|
||||
x
|
||||
|
||||
Need a way to convert the array back to the color name.
|
||||
|
||||
colortoname = (color) ->
|
||||
names = {
|
||||
"#E0E0E0":"Light Grey"
|
||||
"#A0A0E0":"Light Blue"
|
||||
"#9AFE2E":"Light Green"
|
||||
"#FF0000":"Red"
|
||||
"#FF8000":"Orange"
|
||||
"#FFFF00":"Yellow"
|
||||
"#00f000":"Green"
|
||||
"#2EFEF7":"Cyan"
|
||||
"#2EFEF7":"Blue"
|
||||
"#0B0B3B":"Navy"
|
||||
"#FF00FF":"Magenta"
|
||||
"#8000FF":"Purple"
|
||||
"#0A2A0A":"Dark Green"
|
||||
"#3B3B3B":"Dark Grey"
|
||||
"#FFFFFF":"White"
|
||||
"#000000":"Black"
|
||||
}
|
||||
color = color.toUpperCase()
|
||||
x = if hex2dec(color.slice(1)) > 8421504 then "#FFFFFF" else "#000000"
|
||||
|
||||
When clicking 'New' we want to make a brand new Sahli, and then clear out
|
||||
the buttons and create the editor bit as blank.
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
<p>Basics:</p>
|
||||
<div class='drop'>
|
||||
<li>
|
||||
<input type="text" name="entryindex" value="" class='hidden'>
|
||||
<input type="text" id="entryindex" value="" class='hidden'>
|
||||
<label for="file">File name:</label>
|
||||
<input id='entryfile' type="hidden" name="file" value="" placeholder="">
|
||||
<input id='entryfilepick' type="file" name="pickfile" value="" placeholder="">
|
||||
|
|
|
|||
8
todo.txt
8
todo.txt
|
|
@ -1,4 +1,4 @@
|
|||
(C) separate to individual renderers @16colors
|
||||
x 2014-04-16 (C) separate to individual renderers @16colors
|
||||
(C) load to array/picture, render from picture @16colors
|
||||
(C) speed up rendering more? @16colors
|
||||
|
||||
|
|
@ -13,7 +13,11 @@ x 2014-04-05 (A) Split coffeescript into files, use cake.
|
|||
(B) THUMBNAILS - for returning to partymeister
|
||||
|
||||
(A) Create Editor - Standalone @EDITOR
|
||||
(A) - create interface @EDITOR
|
||||
x 2014-04-16 (A) - create interface @EDITOR
|
||||
@EDITOR save (print) routine
|
||||
@EDITOR edit item saves data routine
|
||||
@EDITOR text/bg colors change 'SAHLI' thing
|
||||
@EDITOR fix filename 'holdover' from previous bit
|
||||
(A) - parse files for 'info' @EDITOR @SAUCE
|
||||
|
||||
x 2014-03-24 (B) Get with dfox on the partymeister package version
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue