Merge "Text cleaning." into devel/master

diff --git a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index 1e55ba0..d6ff3ab 100644 (file)
--- a/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@ -458,8 +458,7 @@ void KeyboardFocusManager::CreateDefaultFocusIndicatorActor()
 {
   // Create a focus indicator actor shared by all the keyboard focusable actors
   Toolkit::ImageView focusIndicator = Toolkit::ImageView::New(FOCUS_BORDER_IMAGE_PATH);
-  focusIndicator.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION_PLUS_LOCAL_POSITION );
-  focusIndicator.SetPosition(Vector3(0.0f, 0.0f, 1.0f));
+  focusIndicator.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
 
   // Apply size constraint to the focus indicator
   focusIndicator.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 8012f7f..9576434 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 13;
+const unsigned int TOOLKIT_MICRO_VERSION = 14;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 3569d63..b820c7b 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.1.13
+Version:    1.1.14
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0, BSD-2.0, MIT

diff --git a/plugins/dali-script-v8/docs/content/actor.js b/plugins/dali-script-v8/docs/content/actor.js
index 9f051fb..98b35a4 100644 (file)
--- a/plugins/dali-script-v8/docs/content/actor.js
+++ b/plugins/dali-script-v8/docs/content/actor.js
@@ -124,7 +124,7 @@ function OnPressed( actor, touchEvent )
 }
   
 // connect to touch events
-myActor.connect( "touched", onPressed );
+myActor.on( "touched", onPressed );
 
 ```
 
@@ -143,7 +143,7 @@ hoverEvent = {
 }
 ```
       // connect to touch events
-      myActor.connect( "hovered", onHover);
+      myActor.on( "hovered", onHover);
 
 #### Mouse wheel event
 
@@ -161,7 +161,7 @@ mouseWheelEvent = {
 }
   
 // connect to touch events
-myActor.connect( "mouseWheelEvent", onMouseWheel );
+myActor.on( "mouseWheelEvent", onMouseWheel );
 ```
 #### Key events
 

diff --git a/plugins/dali-script-v8/docs/content/animation.js b/plugins/dali-script-v8/docs/content/animation.js
index 9d4dd48..54ba7c3 100644 (file)
--- a/plugins/dali-script-v8/docs/content/animation.js
+++ b/plugins/dali-script-v8/docs/content/animation.js
@@ -35,7 +35,7 @@ function finished( animation )
   log("Animation finished \n");
 }
   
-anim.connect("finished", finished );
+anim.on("finished", finished );
   
 anim.play();
 ```

diff --git a/plugins/dali-script-v8/docs/content/keyboard-focus-manager.js b/plugins/dali-script-v8/docs/content/keyboard-focus-manager.js
index 821b5dd..fbdf726 100644 (file)
--- a/plugins/dali-script-v8/docs/content/keyboard-focus-manager.js
+++ b/plugins/dali-script-v8/docs/content/keyboard-focus-manager.js
@@ -18,7 +18,7 @@ The application is required to help the manager when moving focus.
 Connect to the pre-focus-change call back as follows:
 ```
 // listen for pre-focus change events
-dali.keyboardFocusManager.connect("keyboardPreFocusChange", this.preFocusChanged);
+dali.keyboardFocusManager.on("keyboardPreFocusChange", this.preFocusChanged);
   
 // example call back handler
   
@@ -39,7 +39,7 @@ myApp.preFocusChanged = function( currentFocusedActor, proposedActorToFocus, dir
   }
 }
   
-dali.keyboardFocusManager.connect("keyboardPreFocusChange", myCallback)
+dali.keyboardFocusManager.on("keyboardPreFocusChange", myCallback)
 ```
 
 KeyboardFocusManager makes the best guess for which actor to focus towards the given direction, but applications might want to change that.
@@ -58,7 +58,7 @@ myCallback( originalFocusedActor, currentFocusedActor)
 {
 }
   
-dali.keyboardFocusManager.connect("keyboardFocusChange", myCallback)
+dali.keyboardFocusManager.on("keyboardFocusChange", myCallback)
 ```
 
 @class KeyboardFocusManager

diff --git a/plugins/dali-script-v8/docs/content/pan-gesture-detector.js b/plugins/dali-script-v8/docs/content/pan-gesture-detector.js
index 1e82183..55291e0 100644 (file)
--- a/plugins/dali-script-v8/docs/content/pan-gesture-detector.js
+++ b/plugins/dali-script-v8/docs/content/pan-gesture-detector.js
@@ -20,7 +20,7 @@ dali.stage.add(actor);
 panGestureDetector.attach(actor);
 
 // Connect the detected signal
-panGestureDetector.connect("panDetected", onPan);
+panGestureDetector.on("panDetected", onPan);
 
 onPan = function(actor, panGesture)
 {

diff --git a/plugins/dali-script-v8/docs/content/resource-image.js b/plugins/dali-script-v8/docs/content/resource-image.js
index e14ad0f..fb982a0 100644 (file)
--- a/plugins/dali-script-v8/docs/content/resource-image.js
+++ b/plugins/dali-script-v8/docs/content/resource-image.js
@@ -28,7 +28,7 @@ function imageLoaded( image )
   
 var image = new dali.ResourceImage( {url: "my_image.png"} );
   
-image.connect("imageLoadingFinished", finished );
+image.on("imageLoadingFinished", finished );
   
 // Create a material and add the image as texture to be used by the material.
 var material = new dali.Material();

diff --git a/plugins/dali-script-v8/docs/content/stage.js b/plugins/dali-script-v8/docs/content/stage.js
index c8b4cf3..512b661 100644 (file)
--- a/plugins/dali-script-v8/docs/content/stage.js
+++ b/plugins/dali-script-v8/docs/content/stage.js
@@ -48,7 +48,7 @@ daliApp.myCallback = function (keyEvent)
   }
 }
 
-dali.stage.connect("keyEvent", daliApp.myCallback);
+dali.stage.on("keyEvent", daliApp.myCallback);
 ```
 
 The key event object has the following properties

diff --git a/plugins/dali-script-v8/src/shared/object-template-helper.cpp b/plugins/dali-script-v8/src/shared/object-template-helper.cpp
index 3510523..34a97e4 100644 (file)
--- a/plugins/dali-script-v8/src/shared/object-template-helper.cpp
+++ b/plugins/dali-script-v8/src/shared/object-template-helper.cpp
@@ -34,12 +34,12 @@ namespace ObjectTemplateHelper
 
 void AddSignalConnectAndDisconnect( v8::Isolate* isolate,  v8::Local<v8::ObjectTemplate>& objTemplate )
 {
-  objTemplate->Set( v8::String::NewFromUtf8( isolate, "connect"),
+  objTemplate->Set( v8::String::NewFromUtf8( isolate, "on"),
                      v8::FunctionTemplate::New( isolate, SignalManager::SignalConnect) );
 
 
 
-  objTemplate->Set( v8::String::NewFromUtf8( isolate, "disconnect"),
+  objTemplate->Set( v8::String::NewFromUtf8( isolate, "off"),
                      v8::FunctionTemplate::New( isolate, SignalManager::SignalDisconnect) );
 }