Mercurial Mercurial > py_tasks_melange / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
app/tiny_mce/plugins/table/js/merge_cells.js
author Sverre Rabbelier <srabbelier@gmail.com>
Tue, 02 Dec 2008 17:59:44 +0000
changeset 647 355ac73823a1
parent 154 d2377425d3f2
permissions -rwxr-xr-x
Swap order of merged params to fix sponsor select view The sponsor select view (in 'create new program') was showing the wrong information (and also using the wrong list template) because the order in which the params were merged was wrong way around. This fixes that and at the same time fixes the 'instruction_text' attribute, which should be named 'list_description' instead. At the same time we lookup and set Sponsor as the scope of the newly created program. Patch by: Sverre Rabbelier
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
126
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     1
 
tinyMCEPopup.requireLangPack();
6186c115a210 Added TinyMCE to Melange in soc/content/js
Pawel Solyga <Pawel.Solyga@gmail.com>
parents:
diff changeset 
     2
 












6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     3


function init() {













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     4


	var f = document.forms[0], v;













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     5














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     6


	tinyMCEPopup.resizeToInnerSize();













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     7














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     8


	f.numcols.value = tinyMCEPopup.getWindowArg('numcols', 1);













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




     9


	f.numrows.value = tinyMCEPopup.getWindowArg('numrows', 1);













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    10


}













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    11














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    12


function mergeCells() {













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    13


	var args = [], f = document.forms[0];













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    14














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    15


	tinyMCEPopup.restoreSelection();













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    16














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    17


	if (!AutoValidator.validate(f)) {













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    18


		tinyMCEPopup.alert(tinyMCEPopup.getLang('invalid_data'));













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    19


		return false;













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    20


	}













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    21














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    22


	args["numcols"] = f.numcols.value;













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    23


	args["numrows"] = f.numrows.value;













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    24














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    25


	tinyMCEPopup.execCommand("mceTableMergeCells", false, args);













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    26


	tinyMCEPopup.close();













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    27


}













6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    28














6186c115a210
Added TinyMCE to Melange in soc/content/js



Pawel Solyga <Pawel.Solyga@gmail.com>


parents: 

diff
changeset




    29


tinyMCEPopup.onInit.add(init);















py_tasks_melange