1
0
forked from GitHub/gf-core

gfse&minibar: fix bug caused by function name clash

+ Function div_id was defined in both editor.js and support.js. Solution:
  moved the more general version from editor.js to support.js.
+ Function div_class was defined in both editor.js and support.js. Solution:
  resolv incompatibility with an argument type test and put the generalized
  function in support.js.
This commit is contained in:
hallgren
2012-03-26 17:08:29 +00:00
parent dc67d6015e
commit ecd6d193ce
2 changed files with 4 additions and 4 deletions

View File

@@ -1387,8 +1387,6 @@ function touch_edit() {
}
/* --- DOM Support ---------------------------------------------------------- */
function div_id(id,cs) { return node("div",{id:id},cs); }
function div_class(cls,cs) { return node("div",{"class":cls},cs); }
function a(url,linked) { return node("a",{href:url},linked); }
function ul(lis) { return node("ul",{},lis); }
function li(xs) { return node("li",{},xs); }

View File

@@ -143,13 +143,15 @@ function empty(tag,name,value) {
function empty_id(tag,id) { return empty(tag,"id",id); }
function empty_class(tag,cls) { return empty(tag,"class",cls); }
function div_id(id) { return empty_id("div",id); }
function div_id(id,cs) { return node("div",{id:id},cs); }
function span_id(id) { return empty_id("span",id); }
function wrap(tag,contents) { return node(tag,{},[contents]); }
function wrap_class(tag,cls,contents) {
return node(tag,{"class":cls},contents ? [contents] : [])
return node(tag,{"class":cls},
contents ? Array.isArray(contents) ?
contents : [contents] : [])
}
function span_class(cls,contents) { return wrap_class("span",cls,contents); }