From 17a54f85b890c73046cc0b7416708ae91d457dea Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Fri, 20 Jul 2012 17:22:00 +0300 Subject: [PATCH 1/3] Fixed Sankore-721. --- src/board/UBBoardView.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index c3a47261..daa8895b 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -1040,6 +1040,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) mMouseButtonIsPressed = false; mPendingStylusReleaseEvent = false; mTabletStylusIsPressed = false; + movingItem = NULL; mLongPressTimer.stop(); } From 344b653951b510f68b4c4838e12c7698d82da782 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 20 Jul 2012 17:31:06 +0200 Subject: [PATCH 2/3] some fixes in search widgets --- resources/library/search/Audio Planete.wgs/index.html | 10 +++------- resources/library/search/Flash Planete.wgs/index.html | 10 +++------- resources/library/search/Video Planete.wgs/index.html | 11 ++++------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/resources/library/search/Audio Planete.wgs/index.html b/resources/library/search/Audio Planete.wgs/index.html index 3d4e5525..5c4dbf9a 100755 --- a/resources/library/search/Audio Planete.wgs/index.html +++ b/resources/library/search/Audio Planete.wgs/index.html @@ -107,7 +107,6 @@ function imageDragging(e){ e.dataTransfer.setData("text/plain",$(this).find("input:hidden").eq(0).val()); - // alert($(this).find("input:hidden").eq(0).val()); } function imageDragleave(e){ @@ -235,15 +234,12 @@ function createMetaData(parent){ var meta = ""; //alert($(this).find("input:hidden").eq(0).val()); - meta = "TypeImageUrl" + + meta = "TypeAudioUrl" + parent.find("input:hidden").eq(0).val() + "Content" + parent.find("input:hidden").eq(1).val() + - "Height" + - parent.find("input:hidden").eq(2).val() + - "Width" + - parent.find("input:hidden").eq(3).val() + - "Title" + + "Heightn/a"+ + "Widthn/aTitle" + parent.find("input:hidden").eq(4).val() + ""; return meta; diff --git a/resources/library/search/Flash Planete.wgs/index.html b/resources/library/search/Flash Planete.wgs/index.html index f9e2db02..e35fab44 100755 --- a/resources/library/search/Flash Planete.wgs/index.html +++ b/resources/library/search/Flash Planete.wgs/index.html @@ -234,16 +234,12 @@ function createMetaData(parent){ var meta = ""; - //alert($(this).find("input:hidden").eq(0).val()); - meta = "TypeImageUrl" + + meta = "TypeFlashUrl" + parent.find("input:hidden").eq(0).val() + "Content" + parent.find("input:hidden").eq(1).val() + - "Height" + - parent.find("input:hidden").eq(2).val() + - "Width" + - parent.find("input:hidden").eq(3).val() + - "Title" + + "Heightn/a"+ + "Widthn/aTitle" + parent.find("input:hidden").eq(4).val() + ""; return meta; diff --git a/resources/library/search/Video Planete.wgs/index.html b/resources/library/search/Video Planete.wgs/index.html index cef2d9ab..6dcb1564 100755 --- a/resources/library/search/Video Planete.wgs/index.html +++ b/resources/library/search/Video Planete.wgs/index.html @@ -203,7 +203,7 @@ }); ( $(".imgContainer").live("click",function(){ - sankore.sendFileMetadata(createMetaData($(this))); + sankore.sendFileMetadata(createMetaData($(this))); })); /*$(window).resize(function(){ @@ -235,15 +235,12 @@ function createMetaData(parent){ var meta = ""; //alert($(this).find("input:hidden").eq(0).val()); - meta = "TypeImageUrl" + + meta = "TypeVideoUrl" + parent.find("input:hidden").eq(0).val() + "Content" + parent.find("input:hidden").eq(1).val() + - "Height" + - parent.find("input:hidden").eq(2).val() + - "Width" + - parent.find("input:hidden").eq(3).val() + - "Title" + + "Heightn/a"+ + "Widthn/aTitle" + parent.find("input:hidden").eq(4).val() + ""; return meta; From ed81281946c2aa5fdbb79527702e68f66b54a51e Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 20 Jul 2012 18:02:01 +0200 Subject: [PATCH 3/3] some fixes ordre mots --- .../locales/fr/scripts/template2.js | 20 ++++++++++--------- .../locales/ru/scripts/template2.js | 20 ++++++++++--------- .../Ordre mots.wgt/scripts/template2.js | 11 ++++++---- .../Ordre mots.wgt/styles/of_puppets.css | 7 ++++--- 4 files changed, 33 insertions(+), 25 deletions(-) diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js index f1b68890..70e765b7 100644 --- a/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js +++ b/resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js @@ -47,8 +47,6 @@ if(window.sankore){ word = sankoreLang.example; } -var doCheckWord = true; - // array of dom elements var letters = []; @@ -67,10 +65,13 @@ var widget_padding = 0; var min_view_width = 400; $(document).ready(function(){ - if(sankore.preference("ord_words_style","")){ - changeStyle(sankore.preference("ord_words_style","")); - $(".style_select").val(sankore.preference("ord_words_style","")); - } else + if(window.sankore){ + if(sankore.preference("ord_words_style","")){ + changeStyle(sankore.preference("ord_words_style","")); + $(".style_select").val(sankore.preference("ord_words_style","")); + } else + changeStyle("3") + } else changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); @@ -300,7 +301,7 @@ turns the widget into the view mode function modeView() { if( editMode ){ - word = $( "#mp_word input:text" ).attr( "value" ); + word = $( "#mp_word .wgt_cont" ).val(); } wgtState = false; @@ -360,14 +361,15 @@ function modeEdit() { editMode = true; wgtState = true; - $( "#mp_word").css( "margin-left", 0 ).empty().append(''); + $( "#mp_word").sortable( "destroy" ); + $( "#mp_word").css( "margin-left", 0 ).empty().append(''); } if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val()); - if($( "#mp_word input:text" ).attr( "value" )) + if($( "#mp_word .wgt_cont" ).val()) { modeView(); var str = ""; diff --git a/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js index 58b2a419..5a7e095e 100644 --- a/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js +++ b/resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js @@ -47,8 +47,6 @@ if(window.sankore){ word = sankoreLang.example; } -var doCheckWord = true; - // array of dom elements var letters = []; @@ -67,10 +65,13 @@ var widget_padding = 0; var min_view_width = 400; $(document).ready(function(){ - if(sankore.preference("ord_words_style","")){ - changeStyle(sankore.preference("ord_words_style","")); - $(".style_select").val(sankore.preference("ord_words_style","")); - } else + if(window.sankore){ + if(sankore.preference("ord_words_style","")){ + changeStyle(sankore.preference("ord_words_style","")); + $(".style_select").val(sankore.preference("ord_words_style","")); + } else + changeStyle("3") + } else changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); @@ -300,7 +301,7 @@ turns the widget into the view mode function modeView() { if( editMode ){ - word = $( "#mp_word input:text" ).attr( "value" ); + word = $( "#mp_word .wgt_cont" ).val(); } wgtState = false; @@ -360,14 +361,15 @@ function modeEdit() { editMode = true; wgtState = true; - $( "#mp_word").css( "margin-left", 0 ).empty().append(''); + $( "#mp_word").sortable( "destroy" ); + $( "#mp_word").css( "margin-left", 0 ).empty().append(''); } if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val()); - if($( "#mp_word input:text" ).attr( "value" )) + if($( "#mp_word .wgt_cont" ).val()) { modeView(); var str = ""; diff --git a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js index 19bdfbc8..ef75b7ce 100644 --- a/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js +++ b/resources/library/interactivities/Ordre mots.wgt/scripts/template2.js @@ -65,12 +65,14 @@ var widget_padding = 0; var min_view_width = 400; $(document).ready(function(){ - if(window.sankore) + if(window.sankore){ if(sankore.preference("ord_words_style","")){ changeStyle(sankore.preference("ord_words_style","")); $(".style_select").val(sankore.preference("ord_words_style","")); } else changeStyle("3") + } else + changeStyle("3") $("#wgt_display").text(sankoreLang.view); $("#wgt_edit").text(sankoreLang.edit); $("#wgt_display, #wgt_edit").click(function(event){ @@ -299,7 +301,7 @@ turns the widget into the view mode function modeView() { if( editMode ){ - word = $( "#mp_word input:text" ).attr( "value" ); + word = $( "#mp_word .wgt_cont" ).val(); } wgtState = false; @@ -359,14 +361,15 @@ function modeEdit() { editMode = true; wgtState = true; - $( "#mp_word").css( "margin-left", 0 ).empty().append(''); + $( "#mp_word").sortable( "destroy" ); + $( "#mp_word").css( "margin-left", 0 ).empty().append(''); } if (window.widget) { window.widget.onleave = function(){ sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val()); - if($( "#mp_word input:text" ).attr( "value" )) + if($( "#mp_word .wgt_cont" ).val()) { modeView(); var str = ""; diff --git a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css index 8be4a1f7..0a1c5924 100644 --- a/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css +++ b/resources/library/interactivities/Ordre mots.wgt/styles/of_puppets.css @@ -12,7 +12,7 @@ body{ .letter{ min-width: 30px; - max-width: 500px; + max-width: 600px; height: 40px; overflow: hidden; border: solid 1px #ccc; @@ -43,11 +43,12 @@ body{ text-align: center; } -#mp_word input{ +#mp_word .wgt_cont{ font: 32px tahoma; letter-spacing: 0.1em; width: 98%; - overflow: auto; + min-height: 200px; + resize: vertical; } #mp_msg{